From 40e6b02f26a7c0a1911a69b951c948f582df4032 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 20 六月 2025 13:23:18 +0800
Subject: [PATCH] 准东数据推送优化

---
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java |    9 ++
 src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java                       |    4 
 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java                  |   14 +++
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java         |   16 +++
 src/main/java/com/ruoyi/project/tr/specialCheck/Test/DealDataTask.java                           |   85 +++++++++++++++++++++
 src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml                                          |    5 +
 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java                |    2 
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java           |   23 +++++
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java  |   24 ++++++
 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java          |    2 
 src/main/resources/mybatis/tr/TbSpecialCheckTaskLogMapper.xml                                    |    7 +
 src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml           |    2 
 src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml                  |    2 
 src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml          |    2 
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java          |    9 ++
 src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml         |    6 
 src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml                 |    2 
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java   |   10 ++
 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java  |   13 +++
 src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml                   |    2 
 20 files changed, 226 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
index 7a38d94..484eeea 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
@@ -85,5 +85,14 @@
 
     private String defend;
 
+    /**
+     * 上报时间
+     */
+    private Date zhunReportTime;
+    /**
+     * 上报状态 1-待上报;2-已上报;3-不上报
+     */
+    private Byte zhunReportStatus;
+
 }
 
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
index c3a6264..1d35ab4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
@@ -108,5 +108,15 @@
      */
     private String taskNum;
 
+    /**
+     * 上报时间
+     */
+    private Date zhunReportTime;
+    /**
+     * 上报状态 1-待上报;2-已上报;3-不上报
+     */
+    private Byte zhunReportStatus;
+
+
 }
 
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
index 86d7dd2..f3e73a2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
@@ -145,6 +145,15 @@
      */
     private String hazardCategory;
 
+    /**
+     * 上报时间
+     */
+    private Date zhunReportTime;
+    /**
+     * 上报状态 1-待上报;2-已上报;3-不上报
+     */
+    private Byte zhunReportStatus;
+
 
 
 }
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
index e530bf6..9e96b5d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
@@ -69,6 +69,10 @@
     private Byte reportStatus;
 
     /**
+     * 上报时间
+     */
+    private Date zhunReportTime;
+    /**
      * 上报状态 1-待上报;2-已上报;3-不上报
      */
     private Byte zhunReportStatus;
@@ -211,11 +215,19 @@
     }
 
 
-    public Byte getzhunReportStatus() {
+    public Date getZhunReportTime() {
+        return zhunReportTime;
+    }
+
+    public void setZhunReportTime(Date zhunReportTime) {
+        this.zhunReportTime = zhunReportTime;
+    }
+
+    public Byte getZhunReportStatus() {
         return zhunReportStatus;
     }
 
-    public void setzhunReportStatus(Byte zhunReportStatus) {
+    public void setZhunReportStatus(Byte zhunReportStatus) {
         this.zhunReportStatus = zhunReportStatus;
     }
 }
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
index 5a60e91..3c77ae2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
@@ -87,6 +87,15 @@
      */
     private Long riskMeasureId;
 
+    /**
+     * 上报时间
+     */
+    private Date zhunReportTime;
+    /**
+     * 上报状态 1-待上报;2-已上报;3-不上报
+     */
+    private Byte zhunReportStatus;
+
     public Long getRiskMeasureId() {
         return riskMeasureId;
     }
@@ -240,5 +249,20 @@
         this.dataSource = dataSource;
     }
 
+    public Date getZhunReportTime() {
+        return zhunReportTime;
+    }
+
+    public void setZhunReportTime(Date zhunReportTime) {
+        this.zhunReportTime = zhunReportTime;
+    }
+
+    public Byte getZhunReportStatus() {
+        return zhunReportStatus;
+    }
+
+    public void setZhunReportStatus(Byte zhunReportStatus) {
+        this.zhunReportStatus = zhunReportStatus;
+    }
 }
 
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
index b3a9bb3..6a2462e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
@@ -66,6 +66,14 @@
      * 风险事件id
      */
     private Long riskEventId;
+    /**
+     * 上报时间
+     */
+    private Date zhunReportTime;
+    /**
+     * 上报状态 1-待上报;2-已上报;3-不上报
+     */
+    private Byte zhunReportStatus;
 
 
     public Long getRiskEventId() {
@@ -179,5 +187,20 @@
         this.dataSource = dataSource;
     }
 
+    public Date getZhunReportTime() {
+        return zhunReportTime;
+    }
+
+    public void setZhunReportTime(Date zhunReportTime) {
+        this.zhunReportTime = zhunReportTime;
+    }
+
+    public Byte getZhunReportStatus() {
+        return zhunReportStatus;
+    }
+
+    public void setZhunReportStatus(Byte zhunReportStatus) {
+        this.zhunReportStatus = zhunReportStatus;
+    }
 }
 
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java
index 1700d8b..958f131 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java
@@ -111,7 +111,7 @@
 
     @Transactional
 //    @Scheduled(cron = "0/10 * * * * ?")  // 30秒
-    @Scheduled(cron = "0 0 0/3 * * ? ")
+    //@Scheduled(cron = "0 0 0/3 * * ? ")
     public void searchReportDate(){
 
         logger.info("【双重预防】纠正...");
@@ -207,6 +207,8 @@
                                 }
                                 CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                                 CJRecordFromTask.setReportTime(null);
+                                CJRecordFromTask.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+                                CJRecordFromTask.setZhunReportTime(null);
                                 CJRecordFromTask.setDataSource((byte) 1);
 
                                 CJRecordFromTask.setCheckTaskId(rectifyJobDataList.get(i).getJobUuid());
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 9df9c4f..4e33719 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -109,7 +109,7 @@
 
 
     @Transactional
-    @Scheduled(cron = "0 0/2 * * * ? ")    // 分钟
+    //@Scheduled(cron = "0 0/2 * * * ? ")    // 分钟
 //    @Scheduled(cron = "0/10 * * * * ?")  // 30秒
  //   @Scheduled(cron = "0 0/25 * * * ? ")    // 分钟
     public void searchReportDate(){
@@ -173,6 +173,8 @@
                     CJReportRiskAnaUnit.setDataSource((byte) 1);
                     CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                     CJReportRiskAnaUnit.setReportTime(null);
+                    CJReportRiskAnaUnit.setZhunReportTime(null);
+                    CJReportRiskAnaUnit.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                     CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id
                     //封装数据
                     CJUnitLists.add(CJReportRiskAnaUnit);
@@ -230,6 +232,8 @@
                     CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());
                     CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                     CJReportRiskEvent.setReportTime(null);
+                    CJReportRiskEvent.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+                    CJReportRiskEvent.setZhunReportTime(null);
                     CJReportRiskEvent.setDataSource((byte) 1);
                     PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());
                     CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());
@@ -297,6 +301,8 @@
                     CJReportMeasure.setUpdateDate(measure.getGmtModitify());
                     CJReportMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                     CJReportMeasure.setReportTime(null);
+                    CJReportMeasure.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+                    CJReportMeasure.setZhunReportTime(null);
                     CJReportMeasure.setDataSource((byte) 1);
                     CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());
                     CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());
@@ -406,6 +412,8 @@
                     }
                     CJTaskFromWork.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                     CJTaskFromWork.setReportTime(null);
+                    CJTaskFromWork.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+                    CJTaskFromWork.setZhunReportTime(null);
                     CJTaskFromWork.setDataSource((byte) 1);
                     CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
                     CJTaskFromWork.setWorkId(jobById.getJobId());
@@ -547,6 +555,8 @@
                                 }
                                 CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                                 CJRecordFromTask.setReportTime(null);
+                                CJRecordFromTask.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+                                CJRecordFromTask.setZhunReportTime(null);
                                 CJRecordFromTask.setDataSource((byte) 1);
                                 List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId());
                                 //获取该条记录对应的管控措施id,
@@ -754,6 +764,8 @@
                     }
                     CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
                     CJDangerInfo.setReportTime(null);
+                    CJDangerInfo.setZhunReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+                    CJDangerInfo.setZhunReportTime(null);
                     CJDangerInfo.setDataSource((byte) 1);
                     CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
                     CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/DealDataTask.java b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/DealDataTask.java
new file mode 100644
index 0000000..497a6d4
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/DealDataTask.java
@@ -0,0 +1,85 @@
+package com.ruoyi.project.tr.specialCheck.Test;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckItemMapper;
+import com.ruoyi.project.tr.specialCheck.mapper.TbSpecialCheckItemLogMapper;
+import com.ruoyi.project.tr.specialCheck.mapper.TbSpecialCheckTaskLogMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+@Component
+public class DealDataTask {
+
+    /**
+     * 每年拉取完检查项需要生成对应的专项任务数据
+     */
+
+    public static final String  TASK_ID = "a8de03f0-4c3e-43fe-a139-0e4ed34edd35";
+
+
+    @Autowired
+    private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
+
+    @Autowired
+    private TbBaseCheckItemMapper baseCheckItemMapper;
+
+    @Autowired
+
+    private TbSpecialCheckItemLogMapper itemLogMapper;
+
+    public void dealData(){
+//        //taskLog 任务 需要改查询日期
+        List<TbSpecialCheckTaskLog> tbSpecialCheckTaskLogs = taskSpecialLogMapper.listTestReportTaskTest();
+        if (tbSpecialCheckTaskLogs != null && !tbSpecialCheckTaskLogs.isEmpty()){
+            for (TbSpecialCheckTaskLog tbSpecialCheckTaskLog : tbSpecialCheckTaskLogs) {
+                tbSpecialCheckTaskLog.setTaskId(TASK_ID);
+                tbSpecialCheckTaskLog.setIndexId(null);
+                tbSpecialCheckTaskLog.setId(UUID.randomUUID().toString());
+                tbSpecialCheckTaskLog.setReportStatus((byte) 1);
+                tbSpecialCheckTaskLog.setCheckType("2");
+                tbSpecialCheckTaskLog.setCreateDate(LocalDateTime.now());
+                tbSpecialCheckTaskLog.setUpdateDate(LocalDateTime.now());
+                taskSpecialLogMapper.save(tbSpecialCheckTaskLog);
+
+            }
+        }
+
+
+//        //任务item
+//
+//        List<TbBaseCheckItem> tbBaseCheckItems = baseCheckItemMapper.listBaseCheckItemBytaskId(TASK_ID);
+//        if (ObjectUtils.isNotEmpty(tbBaseCheckItems)){
+//            for (TbBaseCheckItem tbBaseCheckItem : tbBaseCheckItems) {
+//                TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
+//                tbSpecialCheckItemLog.setId(UUID.randomUUID().toString());
+//                tbSpecialCheckItemLog.setCompanyCode("652310082");
+//                tbSpecialCheckItemLog.setTaskId(TASK_ID);
+//                tbSpecialCheckItemLog.setCheckItemId(tbBaseCheckItem.getId());
+//                tbSpecialCheckItemLog.setCheckName(tbBaseCheckItem.getCheckName());
+//                tbSpecialCheckItemLog.setCheckContent(tbBaseCheckItem.getCheckContent());
+//                tbSpecialCheckItemLog.setCheckWay(tbBaseCheckItem.getCheckWay());
+//                tbSpecialCheckItemLog.setCheckBasis(tbBaseCheckItem.getCheckBasis());
+//                tbSpecialCheckItemLog.setApplicablePlace(tbBaseCheckItem.getApplicablePlace());
+//                tbSpecialCheckItemLog.setCreateBy("李康");
+//                tbSpecialCheckItemLog.setCreateDate(tbBaseCheckItem.getCreateDate());
+//                tbSpecialCheckItemLog.setUpdateBy("李康");
+//                tbSpecialCheckItemLog.setUpdateDate(tbBaseCheckItem.getUpdateDate());
+//                itemLogMapper.save(tbSpecialCheckItemLog);
+//            }
+//        }
+
+
+
+
+
+
+    }
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
index 58c4742..18cbcb7 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -16,6 +16,7 @@
 import com.ruoyi.project.tr.report.domain.Danger;
 import com.ruoyi.project.tr.riskList.domain.RiskList;
 import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import com.ruoyi.project.tr.specialCheck.Test.DealDataTask;
 import com.ruoyi.project.tr.specialCheck.domin.BO.*;
 import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDTO;
 import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckTaskLogDateDTO;
@@ -175,6 +176,18 @@
         }
     }
 
+
+//
+//    @Autowired
+//    private DealDataTask dealDataTask;
+//
+//    @GetMapping("/dealDataTask")
+//    public AjaxResult dealDataTask()
+//    {
+//        dealDataTask.dealData();
+//        return success();
+//    }
+
 }
 
 
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
index b375190..a5a15c7 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
@@ -20,4 +20,6 @@
 
     int updateStatusById(String id);
     int insertBatch(TbBaseCheckItem tbBaseCheckItems);
+
+    List<TbBaseCheckItem> listBaseCheckItemBytaskId(String taskID);
 }
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
index a7a208e..9618a35 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
@@ -27,5 +27,7 @@
 
     List<TbSpecialCheckTaskLog> listTestReportTask();
 
+    List<TbSpecialCheckTaskLog> listTestReportTaskTest();
+
     void updateCheckTaskReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
 }
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
index 800a3dc..af7d67a 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
@@ -58,7 +58,7 @@
         select * from prevent_cj_report_check_record_from_task
         where zhun_report_status = 1 and deleted = 0
             limit 50
-        <!--          and create_date &gt;= '2025-06-15 00:00:00' and create_date &lt;= '2025-06-16 23:59:59'-->
+<!--  and create_date &gt;= '2025-06-15 00:00:00' and create_date &lt;= '2025-06-16 23:59:59'-->
     </select>
 
     <update id="updateHDReportStatusById">
@@ -83,12 +83,12 @@
         insert into prevent_cj_report_check_record_from_task
             (index_id, id, company_code, deleted, create_date, create_by, update_date, update_by,
              report_status, report_time,data_source, check_task_id, check_status, check_time,
-             create_by_mobile, update_by_mobile, task_id, mobile_code, defend)
+             create_by_mobile, update_by_mobile, task_id, mobile_code, defend, zhun_report_status, zhun_report_time)
         values
         <foreach collection="list" item="record" separator=",">
             (null, #{record.id}, #{record.companyCode}, #{record.deleted}, #{record.createDate}, #{record.createBy}, #{record.updateDate},#{record.updateBy},
             #{record.reportStatus}, #{record.reportTime}, #{record.dataSource}, #{record.checkTaskId}, #{record.checkStatus}, #{record.checkTime},
-            #{record.createByMobile}, #{record.updateByMobile}, #{record.taskId}, #{record.mobileCode}, #{record.defend})
+            #{record.createByMobile}, #{record.updateByMobile}, #{record.taskId}, #{record.mobileCode}, #{record.defend}, #{zhunReportStatus}, #{zhunReportTime})
         </foreach>
     </insert>
 
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
index 607eac9..6368267 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -109,7 +109,7 @@
         values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
         , #{riskMeasureId}, #{checkCycle}, #{checkCycleUnit}
         , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId}
-        , #{troubleshootContent},#{taskStartTime},#{workStartTime},#{workEndTime},#{workDayType},#{workType},#{taskNum})
+        , #{troubleshootContent},#{taskStartTime},#{workStartTime},#{workEndTime},#{workDayType},#{workType},#{taskNum}, #{zhunReportStatus}, #{zhunReportTime})
     </insert>
 
 <!--    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
index c3602c0..8cbd20e 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -100,7 +100,7 @@
         , #{hazardCode}, #{riskMeasureId}, #{checkRecordId}, #{dangerName}, #{dangerLevel}, #{dangerSrc}, #{dangerManageType}
         , #{dangerDesc}, #{dangerReason}, #{controlMeasures}, #{cost}, #{dangerManageDeadline}, #{dangerState}, #{hazardDangerType}
         , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime}, #{hazardCategory}
-        , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId})
+        , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId}, #{zhunReportStatus}, #{zhunReportTime})
     </insert>
 
 <!--    List<PreventCJReportDangerInfo> getDangerListForCheckTask();-->
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
index c3fc181..72a23a1 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
@@ -83,7 +83,7 @@
         insert into prevent_cj_report_risk_ana_unit
         values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
         , #{riskUnitName}, #{hazardCode}, #{hazardDep}, #{hazardLiablePerson}
-        , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskUnitId})
+        , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskUnitId}, #{zhunReportStatus}, #{zhunReportTime})
     </insert>
 
 </mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
index ba57cca..9aca5ab 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
@@ -70,7 +70,7 @@
         insert into prevent_cj_report_risk_control_measure
         values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
         , #{riskEventId}, #{dataSrc}, #{riskMeasureDesc}, #{troubleshootContent}, #{classify1}, #{classify2}, #{classify3}
-        , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskMeasureId})
+        , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskMeasureId}, #{zhunReportStatus}, #{zhunReportTime})
     </insert>
 
 
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
index 82a6618..fe43a7f 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
@@ -67,7 +67,7 @@
     <insert id="insertEventLists" >
         insert into prevent_cj_report_risk_event
         values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
-        , #{riskEventName}, #{riskUnitId}, #{reportStatus}, #{reportTime}, #{dataSource}, #{riskEventId})
+        , #{riskEventName}, #{riskUnitId}, #{reportStatus}, #{reportTime}, #{dataSource}, #{riskEventId}, #{zhunReportStatus}, #{zhunReportTime})
     </insert>
 
 
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
index 7f54a85..730427f 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
@@ -62,7 +62,10 @@
         where deleted = 0 and status = 1
         limit 1
     </select>
-<!--    int updateStatusById(String id);-->
+    <select id="listBaseCheckItemBytaskId" resultMap="BaseResultMap" parameterType="String">
+        select * from tb_base_check_item where deleted = 0 and task_id = #{taskId}
+    </select>
+    <!--    int updateStatusById(String id);-->
     <update id="updateStatusById" parameterType="com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem">
         update tb_base_check_item set
             status =  2
diff --git a/src/main/resources/mybatis/tr/TbSpecialCheckTaskLogMapper.xml b/src/main/resources/mybatis/tr/TbSpecialCheckTaskLogMapper.xml
index 09fbbe6..cec96dd 100644
--- a/src/main/resources/mybatis/tr/TbSpecialCheckTaskLogMapper.xml
+++ b/src/main/resources/mybatis/tr/TbSpecialCheckTaskLogMapper.xml
@@ -149,6 +149,13 @@
         select * from tb_special_check_task_log
         where deleted = 0 and report_status = 1
     </select>
+
+    <select id="listTestReportTaskTest" resultMap="BaseResultMap">
+        select * from tb_special_check_task_log
+        where deleted = 0  and create_date &gt;= '2024-01-01 00:00:00' and create_date &lt;= '2024-06-16 23:59:59'
+    </select>
+
+
 <!--    void updateCheckTaskReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
     <update id="updateCheckTaskReportStatusById">
         update tb_special_check_task_log

--
Gitblit v1.9.2