Commit fd646207 authored by 廖旭伟's avatar 廖旭伟

修改bug

parent 438ce87f
...@@ -39,11 +39,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte ...@@ -39,11 +39,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
@Override @Override
protected void findAfter(SingleMatterEntity params, PageInfo pageInfo, Context context, List<SingleMatterEntity> list) throws AppException { protected void findAfter(SingleMatterEntity params, PageInfo pageInfo, Context context, List<SingleMatterEntity> list) throws AppException {
List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount(); // List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount();
Map<Long,Integer> datumCountMap = new HashMap<>(); // Map<Long,Integer> datumCountMap = new HashMap<>();
for (MatterDatumEntity item:matterDatumFileEntities){ // for (MatterDatumEntity item:matterDatumFileEntities){
datumCountMap.put(item.getMatterId(),item.getCount()); // datumCountMap.put(item.getMatterId(),item.getCount());
} // }
list.stream().peek(item->{ list.stream().peek(item->{
// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId())); // List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
// if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) { // if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
...@@ -51,11 +51,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte ...@@ -51,11 +51,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
// }else { // }else {
// item.setDatumCount(0); // item.setDatumCount(0);
// } // }
if(datumCountMap.containsKey(item.getMatterId())){ // if(datumCountMap.containsKey(item.getMatterId())){
item.setDatumCount(datumCountMap.get(item.getMatterId())); // item.setDatumCount(datumCountMap.get(item.getMatterId()));
}else { // }else {
item.setDatumCount(0); // item.setDatumCount(0);
} // }
SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId())); SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId()));
if(singleMatterFileEntity!=null){ if(singleMatterFileEntity!=null){
item.setHasApplyForm(1); item.setHasApplyForm(1);
...@@ -68,11 +68,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte ...@@ -68,11 +68,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
@Override @Override
protected void findAfter(SingleMatterEntity params, Context context, List<SingleMatterEntity> list) throws AppException { protected void findAfter(SingleMatterEntity params, Context context, List<SingleMatterEntity> list) throws AppException {
List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount(); // List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.getMatterDatumCount();
Map<Long,Integer> datumCountMap = new HashMap<>(); // Map<Long,Integer> datumCountMap = new HashMap<>();
for (MatterDatumEntity item:matterDatumFileEntities){ // for (MatterDatumEntity item:matterDatumFileEntities){
datumCountMap.put(item.getMatterId(),item.getCount()); // datumCountMap.put(item.getMatterId(),item.getCount());
} // }
list.stream().peek(item->{ list.stream().peek(item->{
// List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId())); // List<MatterDatumEntity> matterDatumFileEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
// if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) { // if(CollectionUtils.isNotEmpty(matterDatumFileEntities)) {
...@@ -80,11 +80,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte ...@@ -80,11 +80,11 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
// }else { // }else {
// item.setDatumCount(0); // item.setDatumCount(0);
// } // }
if(datumCountMap.containsKey(item.getMatterId())){ // if(datumCountMap.containsKey(item.getMatterId())){
item.setDatumCount(datumCountMap.get(item.getMatterId())); // item.setDatumCount(datumCountMap.get(item.getMatterId()));
}else { // }else {
item.setDatumCount(0); // item.setDatumCount(0);
} // }
SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId())); SingleMatterFileEntity singleMatterFileEntity = singleMatterFileService.selectOne(new SingleMatterFileQuery().matterId(item.getMatterId()));
if(singleMatterFileEntity!=null){ if(singleMatterFileEntity!=null){
item.setHasApplyForm(1); item.setHasApplyForm(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment