From 247a4a1f10f233c89a4bd054dee3cb9b7d4a76f1 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 19 十一月 2025 08:40:12 +0800
Subject: [PATCH] 新增数据上传准东

---
 src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
index 3b69969..49bb54d 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -61,11 +61,11 @@
 <!--        where zhun_report_status = 1-->
 <!--            limit 50-->
 <!--,c.pre_rectify_photo,c.post_rectify_photo,c.rectify_attachment-->
-        select a.* from prevent_cj_report_danger_info a
-<!--        INNER JOIN prevent_risk_danger_info b on  a.id = b.uuid-->
-<!--        INNER JOIN tr_hidden_danger_check_point c on c.id = b.danger_check_point_id-->
-        where a.zhun_report_status = 1 and a.deleted = 0
-        and a.create_date &gt;= '2025-06-15 00:00:00' and a.create_date &lt;= '2025-06-18 23:59:59'
+        select a.* ,c.pre_rectify_photo,c.post_rectify_photo,c.rectify_attachment from prevent_cj_report_danger_info a
+        INNER JOIN prevent_risk_danger_info b on  a.id = b.uuid
+        INNER JOIN tr_hidden_danger_check_point c on c.id = b.danger_check_point_id
+        where a.zhun_report_status = 1 and a.deleted = 0 and a.danger_manage_deadline &gt;= a.regist_time
+<!--        and a.create_date &gt;= '2025-06-15 00:00:00' and a.create_date &lt;= '2025-06-18 23:59:59'-->
         limit 50
     </select>
 
@@ -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();-->

--
Gitblit v1.9.2