|
@@ -475,9 +475,10 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Map<String,Object>> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList) {
|
|
|
+ public Map<String,Object> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList) {
|
|
|
Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
|
|
|
List<ZEngineeringNode> nodeTypeList=new ArrayList<>();
|
|
|
+ Map<String,Object> statemap=new HashMap<>();
|
|
|
List<Map<String,Object>> ReViewMap=new ArrayList<>();
|
|
|
AtomicReference<List<Map<String, Object>>> ReViewStateMap= new AtomicReference<>(new ArrayList<>());
|
|
|
zEngineeringCivilList.stream().forEach(item->{
|
|
@@ -489,7 +490,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
|
|
|
List <ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
|
|
|
nodeTypeList.addAll(nodeList);
|
|
|
nodeList.stream().forEach(item2->{
|
|
|
- ReViewStateMap.get().clear();
|
|
|
+ List stateList=new ArrayList();
|
|
|
LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
|
|
|
lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
|
|
|
List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
|
|
@@ -503,18 +504,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
|
|
|
map.put("Type",item3.getDictValue());
|
|
|
map.put("state","0");
|
|
|
}
|
|
|
- ReViewStateMap.get().add(map);
|
|
|
+ stateList.add(map);
|
|
|
+
|
|
|
});
|
|
|
+ ReViewStateMap.set(stateList);;
|
|
|
|
|
|
});
|
|
|
- Map<String,Object> statemap=new HashMap<>();
|
|
|
- statemap.put(item.getId(),ReViewStateMap);
|
|
|
- ReViewMap.add(statemap);
|
|
|
+
|
|
|
+ List stateList=ReViewStateMap.get();
|
|
|
+ statemap.put(item.getId(),stateList);
|
|
|
MonthTableNameHandler.removeData();
|
|
|
|
|
|
});
|
|
|
|
|
|
- return ReViewMap;
|
|
|
+ return statemap;
|
|
|
}
|
|
|
|
|
|
|