|
|
@@ -1401,8 +1401,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (id==null)id=myPublic.get(0).getId();
|
|
|
OutPublicReleaseList out = publicReleaseMapper.selectOutListBoById(id);
|
|
|
- out.setPrdList(publicReleaseDetailsMapper.selectByPrid(id));
|
|
|
- out.setPrdcList(publicReleaseDateClockMapper.selectByPrid(id));
|
|
|
+ List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
+ List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
|
|
|
+ pushDateClockDetails(prdList,prdcList);
|
|
|
+ out.setPrdList(prdList);
|
|
|
return out;
|
|
|
// List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
|
|
|
// if (myPublic.isEmpty()){
|
|
|
@@ -1415,7 +1417,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// }
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ private void pushDateClockDetails(List<OutPublicReleaseDetails> prdList, List<PublicReleaseDateClock> prdcList) {
|
|
|
+ for (OutPublicReleaseDetails out : prdList) {
|
|
|
+ List<PublicReleaseDateClock> elist=new ArrayList<>();;
|
|
|
+ for (PublicReleaseDateClock prdc : prdcList) {
|
|
|
+ if (prdc.getPrdid().equals(out.getId())){
|
|
|
+ elist.add(prdc);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ out.setPrdcList(elist);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/**
|