From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug

---
 java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
index b8b59cc..4946cc5 100755
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
@@ -121,8 +121,9 @@
         inspectionStateName,
         ipl.inspection_plan_name,ipl.inspection_plan_name inspectionPlanName,ir.route_name,ir.route_name routeName,
         it.plan_user_name,it.plan_user_name planUserName,it.act_user_name,it.act_user_name actUserName,td4.name,td4.name
-        signTypeName,td5.name taskStateName
+        signTypeName,td5.name taskStateName,ip.item_id itemId
         from inspection_task_detail t
+        LEFT JOIN inspection_point ip on t.inspection_id = ip.inspection_id and ip.status_cd = '0'
         left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'inspection_task_detail' and
         td1.table_columns = 'state'
         left join t_dict td2 on t.patrol_type = td2.status_cd and td2.table_name = 'inspection_task_detail' and
@@ -188,6 +189,9 @@
         <if test="planUserName !=null and planUserName != ''">
             and it.plan_user_name= #{planUserName}
         </if>
+        <if test="planUserId !=null and planUserId != ''">
+            and it.plan_user_id= #{planUserId}
+        </if>
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
             and ipl.inspection_plan_name= #{inspectionPlanName}
         </if>
@@ -205,6 +209,15 @@
         </if>
         <if test="nowTime != null">
             and t.create_time &lt; #{nowTime}
+        </if>
+        <if test="qrCodeTime != null">
+            and t.create_time &gt; #{qrCodeTime}
+        </if>
+        <if test="inspectionStartTime !=null and inspectionStartTime != ''">
+            and t.inspection_time &gt;= #{inspectionStartTime}
+        </if>
+        <if test="inspectionEndTime !=null and inspectionEndTime != ''">
+            and t.inspection_time &lt;= #{inspectionEndTime}
         </if>
         order by t.sort_number desc
         <if test="page != -1 and page != null ">
@@ -329,6 +342,9 @@
         <if test="planUserName !=null and planUserName != ''">
             and it.plan_user_name= #{planUserName}
         </if>
+        <if test="planUserId !=null and planUserId != ''">
+            and it.plan_user_id= #{planUserId}
+        </if>
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
             and ipl.inspection_plan_name= #{inspectionPlanName}
         </if>
@@ -344,5 +360,11 @@
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
         </if>
+        <if test="inspectionStartTime !=null and inspectionStartTime != ''">
+            and t.inspection_time &gt;= #{inspectionStartTime}
+        </if>
+        <if test="inspectionEndTime !=null and inspectionEndTime != ''">
+            and t.inspection_time &lt;= #{inspectionEndTime}
+        </if>
     </select>
 </mapper>

--
Gitblit v1.8.0