统计问题

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -22,6 +22,7 @@ import com.ruoyi.zdsz.service.*;
 import com.ruoyi.zdsz.task.RiewTask;
 import com.ruoyi.zdsz.task.photoTask;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.internal.util.stereotypes.Lazy;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -60,7 +61,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @Resource
     private ZMaterialStatisticsMapper zMaterialStatisticsMapper;
     @Resource
-    private final ZEngineeringNodeMapper zEngineeringNodeMapper;
+    private ZEngineeringNodeMapper zEngineeringNodeMapper;
     @Resource
     private IZEngineeringReviewService izEngineeringReviewService;
     @Resource

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.zdsz.enums.photoType;
 import com.ruoyi.zdsz.mapper.*;
 import com.ruoyi.zdsz.service.*;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.internal.util.stereotypes.Lazy;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -57,8 +58,8 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     private IZEngineeringReviewService izEngineeringReviewService;
     @Resource
     private ZEngineeringNodeMapper zEngineeringNodeMapper;
-@Resource
-private ZEngineeringMaterialMapper zEngineeringMaterialMapper;
+    @Resource
+    private ZEngineeringMaterialMapper zEngineeringMaterialMapper;
     @Resource
     private final ZMaterialStatisticsMapper zMaterialStatisticsMapper;
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -25,7 +25,9 @@ import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.validator.internal.util.stereotypes.Lazy;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -53,21 +55,21 @@ import static cn.hutool.core.date.DateUtil.format;
 public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 
     private final ZEngineeringNodeMapper baseMapper;
-    @Resource
+    @Autowired
     private IZEngineeringInfoService izEngineeringInfoService;
-    @Resource
+    @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-    @Resource
+    @Autowired
     private IZEngineeringReviewService izEngineeringReviewService;
-    @Resource
+    @Autowired
     private IZEngiineeringPhotoService izEngiineeringPhotoService;
-    @Resource
+    @Autowired
     private ZEngineeringCivilMapper zEngineeringCivilMapper;
-    @Resource
+    @Autowired
     private  ZEngineeringReviewMapper zEngineeringReviewMapper;
-    @Resource
+    @Autowired
     private ZComprehensiveMapper zComprehensiveMapper;
-    @Resource
+    @Autowired
     private ZEngineeringInfoMapper zEngineeringInfoMapper;
 
 
@@ -100,8 +102,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         BeanUtil.copyProperties(zEngineeringNode, zEngineeringNodeBo, "id");
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
         List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.query(zEngineeringNodeBo);
-      ZEngineeringReviewBo zEngineeringReview=  izEngineeringReviewService.query(zEngineeringNodeBo);
-      zEngineeringNodeBo.setReviewStatus(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewStatus());
+        ZEngineeringReviewBo zEngineeringReview=  izEngineeringReviewService.query(zEngineeringNodeBo);
+        zEngineeringNodeBo.setReviewStatus(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewStatus());
+        zEngineeringNodeBo.setReviewContent(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewContent());
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
@@ -688,9 +691,11 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (nodeList.size()>0&&nodeList.stream().anyMatch(x->x.getType().equals(item3.getDictValue()))){
                     map.put("Type",item3.getDictValue());
                     map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewStatus():"0");
+                    map.put("content",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent():"暂未审核");
                 }else {
                     map.put("Type",item3.getDictValue());
                     map.put("state","0");
+                    map.put("content","暂未审核");
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZMaterialStatisticsServiceImpl.java

@@ -42,8 +42,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsService {
 
     private final ZMaterialStatisticsMapper baseMapper;
-    @Resource
-    private IZEngineeringInfoService izEngineeringInfoService;
 
     /**
      * 查询用料统计
@@ -103,7 +101,6 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
     @Override
     @Async("threadPoolTaskExecutor")
     public Boolean insert(ZEngineeringCivilBo bo) {
-//      List<ZEngineeringMaterialBo> zMaterialStatisticsList= izEngineeringInfoService.getzEngineeringMaterialBoList(bo);
         if (ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
             bo.getzEngineeringNodeBoList().stream().forEach(item2 -> {
                 if (item2.getzEngineeringInfoBo().getzEngineeringMaterialBo().size() > 0) {