违章状态修改

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;
+
     /**
      * 违章照片
      */

src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java

@@ -29,4 +29,6 @@ public interface ProPullDao {
     void updateSafetyViolationData(List<SafetyViolationVo> safeList);
 
     void updateQualityInspectionData(List<SafetyViolationVo> qualityList);
+
+    void updateComprehensiveStatus(List<SafetyViolationVo> safeList);
 }

src/main/java/com/bonus/imgTool/task/job/ProPullTask.java

@@ -92,11 +92,17 @@ public class ProPullTask {
     @Async
     public void updateRectStatusTask() {
         log.info("--------整改状态随时间流逝变化定时器开启------");
-        //实名制工程
+        //检查
         List<SafetyViolationVo> safeList = dao.getSafetyViolationData();
         dao.updateSafetyViolationData(safeList);
+        //质量
         List<SafetyViolationVo> 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("--------整改状态随时间流逝变化定时器完毕------");
     }
 

src/main/resources/mappers/basic/ProPullMapper.xml

@@ -113,9 +113,21 @@
 			</if>
 		</foreach>
 	</update>
+    <update id="updateComprehensiveStatus">
+		<foreach collection="list" item="item" separator=";">
+			<if test="item.id != null">
+				UPDATE
+				tb_comprehensive_query
+				SET
+				rect_status = #{item.rectStatus}
+				WHERE
+				id = #{item.id} and upload_type = #{item.uploadType}
+			</if>
+		</foreach>
+	</update>
 
 
-	<select id="getProjectData" resultType="com.bonus.imgTool.basic.vo.dto.ProDto">
+    <select id="getProjectData" resultType="com.bonus.imgTool.basic.vo.dto.ProDto">
 		SELECT
 			bp.id AS proId,
 			bp.`NAME` AS proName,