From bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:24:47 +0800
Subject: [PATCH] 修复扣款

---
 java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml |   54 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 9ac899a..773d4d4
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
@@ -121,7 +121,8 @@
         statusCd,t.act_user_name,t.act_user_name actUserName,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,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name inspectionPlanName
+        actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name
+        inspectionPlanName
         from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
         where 1 =1
         and t.sign_type = td1.status_cd
@@ -135,11 +136,17 @@
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null ">
-            and t.act_ins_time= #{actInsTime}
+        <if test="startTime != null">
+            and t.act_ins_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and t.act_ins_time &lt;= #{endTime}
         </if>
         <if test="planInsTime !=null ">
             and t.plan_ins_time= #{planInsTime}
+        </if>
+        <if test="todayPlanInsTime !=null ">
+            and t.plan_ins_time &gt; #{todayPlanInsTime}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -153,8 +160,11 @@
         <if test="inspectionPlanId !=null and inspectionPlanId != ''">
             and t.inspection_plan_id= #{inspectionPlanId}
         </if>
+        <if test="inspectionPlanName != null and inspectionPlanName != ''">
+            and ip.inspection_plan_name = #{inspectionPlanName}
+        </if>
         <if test="planUserName !=null and planUserName != ''">
-            and t.plan_user_name= #{planUserName}
+            and t.plan_user_name like '%${planUserName}%'
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -171,6 +181,12 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="scopeTime !=null ">
             and t.create_time &lt; #{scopeTime}
             and t.create_time &gt; #{createTime}
@@ -179,7 +195,6 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
 
@@ -226,7 +241,6 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ娲诲姩鏁伴噺 add by wuxw 2018-07-03 -->
@@ -245,8 +259,11 @@
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null ">
-            and t.act_ins_time= #{actInsTime}
+        <if test="startTime != null">
+            and t.act_ins_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and t.act_ins_time &lt;= #{endTime}
         </if>
         <if test="planInsTime !=null ">
             and t.plan_ins_time= #{planInsTime}
@@ -263,8 +280,11 @@
         <if test="inspectionPlanId !=null and inspectionPlanId != ''">
             and t.inspection_plan_id= #{inspectionPlanId}
         </if>
+        <if test="inspectionPlanName != null and inspectionPlanName != ''">
+            and ip.inspection_plan_name = #{inspectionPlanName}
+        </if>
         <if test="planUserName !=null and planUserName != ''">
-            and t.plan_user_name= #{planUserName}
+            and t.plan_user_name like '%${planUserName}%'
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -278,8 +298,15 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
-
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
     <!-- 鏌ヨ鏈畨鎺掔殑宸℃璁″垝 -->
@@ -301,7 +328,7 @@
         AND it.status_cd = '0'
         AND ip.community_id = it.community_id
         <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020023'">
-        and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 7 DAY)
+            and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 7 DAY)
         </if>
         <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020024'">
             and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 30 DAY)
@@ -338,7 +365,4 @@
             (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405')
         </foreach>
     </insert>
-
-
-
 </mapper>

--
Gitblit v1.8.0