diff --git a/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java b/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java index 6974c92..1327755 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java @@ -155,6 +155,11 @@ public class SafetyViolationVo extends PageEntity { */ private String proStatus; + /** + * 工程状态 + */ + private String uploadType; + /** * 违章照片 */ diff --git a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java index e90e558..f6921cc 100644 --- a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java +++ b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java @@ -29,4 +29,6 @@ public interface ProPullDao { void updateSafetyViolationData(List safeList); void updateQualityInspectionData(List qualityList); + + void updateComprehensiveStatus(List safeList); } diff --git a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java index 930451c..28bba8b 100644 --- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java +++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java @@ -92,11 +92,17 @@ public class ProPullTask { @Async public void updateRectStatusTask() { log.info("--------整改状态随时间流逝变化定时器开启------"); - //实名制工程 + //检查 List safeList = dao.getSafetyViolationData(); dao.updateSafetyViolationData(safeList); + //质量 List qualityList = dao.getQualityInspectionData(); dao.updateQualityInspectionData(qualityList); + //总表状态数据 + safeList.forEach(item -> item.setUploadType("1")); + qualityList.forEach(item -> item.setUploadType("2")); + safeList.addAll(qualityList); + dao.updateComprehensiveStatus(safeList); log.info("--------整改状态随时间流逝变化定时器完毕------"); } diff --git a/src/main/resources/mappers/basic/ProPullMapper.xml b/src/main/resources/mappers/basic/ProPullMapper.xml index cb9847a..5e2fef2 100644 --- a/src/main/resources/mappers/basic/ProPullMapper.xml +++ b/src/main/resources/mappers/basic/ProPullMapper.xml @@ -113,9 +113,21 @@ + + + + UPDATE + tb_comprehensive_query + SET + rect_status = #{item.rectStatus} + WHERE + id = #{item.id} and upload_type = #{item.uploadType} + + + - SELECT bp.id AS proId, bp.`NAME` AS proName,