项目信息变更统计导出封装

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ExportController.java

@@ -158,7 +158,8 @@ public class ExportController {
                         projectInfo.getTimeOutPayCount(),
                         projectInfo.getTimeOutPaySituation(),
                         projectInfo.getUploadFileRate(),
-                        projectInfo.getProjectTimeOutSituation()))
+                        projectInfo.getProjectTimeOutSituation(),
+                        projectInfo.getUpdateCount()))
                 .collect(Collectors.toList());
 
         // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman

huzhou/src/main/java/com/easy/admin/modules/huzhou/dto/ProjectTimeOutInfoExportDTO.java

@@ -43,6 +43,10 @@ public class ProjectTimeOutInfoExportDTO {
     @ExcelProperty("上传文件进度（%）")
     private Double uploadFileRate;
 
+    @ExcelProperty("修改次数")
+    private int updateCount;
+
+
     public ProjectTimeOutInfoExportDTO(String projectName,
                                        String dutyWorkplace,
                                        String reformName,
@@ -52,7 +56,8 @@ public class ProjectTimeOutInfoExportDTO {
                                        int timeOutPayCount,
                                        String timeOutPaySituation,
                                        Double uploadFileRate,
-                                       String projectTimeOutSituation
+                                       String projectTimeOutSituation,
+                                       int updateCount
                                        ) {
         this.projectName = projectName;
         this.superiorFundPayRate = superiorFundPayRate;
@@ -64,6 +69,7 @@ public class ProjectTimeOutInfoExportDTO {
         this.timeOutPaySituation = timeOutPaySituation;
         this.uploadFileRate = uploadFileRate;
         this.projectTimeOutSituation = projectTimeOutSituation;
+        this.updateCount = updateCount;
     }
 
 

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -119,6 +119,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     private IHuzhouPlaninfofileService planinfofileService;
     @Autowired
     private HuzhouInformationMaterialMapper informationMaterialMapper;
+    @Autowired
+    private IHuzhouFieldchangehistoryService fieldchangehistoryService;
+
 
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
@@ -2828,7 +2831,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             projectInfo.setTimeOutPayCount(tmp.getTimeOutPayCount());
             // 5.设置文件上传占用率
             projectInfo.setUploadFileRate(planinfofileService.getUploadFileRate(projectId));
-
+            // 6设置变更次数
+            projectInfo.setUpdateCount(fieldchangehistoryService.queryUpdateCount(projectId));
+            log.info("项目:{}->超时支付次数为:{}", projectInfo.getProjectName(),projectInfo.getUpdateCount());
         }
         // 按照责任工作地点排序
         projectInfoList = projectInfoList.stream()