From f14c50cb0036d3ddd655ce4e34732ba396a836c4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:42:03 +0800
Subject: [PATCH] optimize 统计

---
 java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
index 7140dba..38a6398 100755
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
@@ -20,7 +20,8 @@
         t.act_user_name,t.act_user_name actUserName,t.operate,t.sign_type,t.sign_type signType,
         t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name planUserName,
         t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id actUserId,t.task_id,
-        t.task_id taskId,t.state,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
+        t.task_id taskId,t.state,t.original_plan_user_id,t.original_plan_user_id
+        originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
         t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType from business_inspection_task t
         where 1 =1
         <if test="planUserId !=null and planUserId != ''">
@@ -124,7 +125,8 @@
         signType,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name
         planUserName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id
         actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name
-        inspectionPlanName,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
+        inspectionPlanName,t.original_plan_user_id,t.original_plan_user_id
+        originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
         t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType
         from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
         where 1 =1
@@ -139,6 +141,9 @@
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
+        <if test="originalPlanUserId !=null and originalPlanUserId != ''">
+            and t.original_plan_user_id= #{originalPlanUserId}
+        </if>
         <if test="startTime != null">
             and t.act_ins_time &gt;= #{startTime}
         </if>
@@ -146,7 +151,7 @@
             and t.act_ins_time &lt;= #{endTime}
         </if>
         <if test="planInsTime !=null ">
-            and t.plan_ins_time= #{planInsTime}
+            and DATE_FORMAT(t.plan_ins_time,'%Y-%m-%d')= #{planInsTime}
         </if>
         <if test="planEndTime !=null ">
             and t.plan_end_time= #{planEndTime}
@@ -200,7 +205,7 @@
             and t.create_time &lt; #{scopeTime}
             and t.create_time &gt; #{createTime}
         </if>
-        order by t.create_time desc
+        order by t.plan_ins_time
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -283,6 +288,9 @@
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
+        <if test="originalPlanUserId !=null and originalPlanUserId != ''">
+            and t.original_plan_user_id= #{originalPlanUserId}
+        </if>
         <if test="startTime != null">
             and t.act_ins_time &gt;= #{startTime}
         </if>
@@ -290,7 +298,7 @@
             and t.act_ins_time &lt;= #{endTime}
         </if>
         <if test="planInsTime !=null ">
-            and t.plan_ins_time= #{planInsTime}
+            and DATE_FORMAT(t.plan_ins_time,'%Y-%m-%d')= #{planInsTime}
         </if>
         <if test="planEndTime !=null ">
             and t.plan_end_time= #{planEndTime}

--
Gitblit v1.8.0