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 |  133 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 104 insertions(+), 29 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 3482ed5..773d4d4
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
     <!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessInspectionTaskInfo" parameterType="Map">
         insert into business_inspection_task(
-        plan_user_id,act_ins_time,plan_ins_time,act_user_name,operate,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id
+        plan_user_id,act_ins_time,plan_ins_time,act_user_name,operate,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id,state
         ) values (
-        #{planUserId},#{actInsTime},#{planInsTime},#{actUserName},#{operate},#{signType},#{inspectionPlanId},#{planUserName},#{communityId},#{bId},#{actUserId},#{taskId}
+        #{planUserId},#{actInsTime},#{planInsTime},#{actUserName},#{operate},#{signType},#{inspectionPlanId},#{planUserName},#{communityId},#{bId},#{actUserId},#{taskId},#{state}
         )
     </insert>
 
@@ -20,16 +20,16 @@
         actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,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
+        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
         from business_inspection_task t
         where 1 =1
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null and actInsTime != ''">
+        <if test="actInsTime !=null ">
             and t.act_ins_time= #{actInsTime}
         </if>
-        <if test="planInsTime !=null and planInsTime != ''">
+        <if test="planInsTime !=null ">
             and t.plan_ins_time= #{planInsTime}
         </if>
         <if test="actUserName !=null and actUserName != ''">
@@ -59,6 +59,9 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
 
     </select>
 
@@ -66,17 +69,17 @@
     <!-- 淇濆瓨娲诲姩淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionTaskInfoInstance" parameterType="Map">
         insert into inspection_task(
-        plan_user_id,act_ins_time,plan_ins_time,status_cd,act_user_name,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id
+        plan_user_id,act_ins_time,plan_ins_time,status_cd,act_user_name,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,act_user_id,task_id,state
         ) select
-        t.plan_user_id,t.act_ins_time,t.plan_ins_time,'0',t.act_user_name,t.sign_type,t.inspection_plan_id,t.plan_user_name,t.community_id,t.b_id,t.act_user_id,t.task_id
+        t.plan_user_id,t.act_ins_time,t.plan_ins_time,'0',t.act_user_name,t.sign_type,t.inspection_plan_id,t.plan_user_name,t.community_id,t.b_id,t.act_user_id,t.task_id,t.state
         from business_inspection_task t where 1=1
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null and actInsTime != ''">
+        <if test="actInsTime !=null">
             and t.act_ins_time= #{actInsTime}
         </if>
-        <if test="planInsTime !=null and planInsTime != ''">
+        <if test="planInsTime !=null ">
             and t.plan_ins_time= #{planInsTime}
         </if>
         <if test="actUserName !=null and actUserName != ''">
@@ -104,6 +107,9 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
 
     </insert>
 
@@ -115,17 +121,32 @@
         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
-        from inspection_task t
+        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
+        and td1.table_name = 'inspection_task'
+        and td1.table_columns = 'sign_type'
+        and t.state = td2.status_cd
+        and td2.table_name = 'inspection_task'
+        and td2.table_columns = 'state'
+        and ip.inspection_plan_id = t.inspection_plan_id
+        and ip.status_cd = '0'
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null and actInsTime != ''">
-            and t.act_ins_time= #{actInsTime}
+        <if test="startTime != null">
+            and t.act_ins_time &gt;= #{startTime}
         </if>
-        <if test="planInsTime !=null and planInsTime != ''">
+        <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}
@@ -139,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}
@@ -154,11 +178,23 @@
         <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>
+        <if test="scopeTime !=null ">
+            and t.create_time &lt; #{scopeTime}
+            and t.create_time &gt; #{createTime}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
 
@@ -171,10 +207,13 @@
         <if test="planUserId !=null and planUserId != ''">
             , t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null and actInsTime != ''">
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="actInsTime !=null ">
             , t.act_ins_time= #{actInsTime}
         </if>
-        <if test="planInsTime !=null and planInsTime != ''">
+        <if test="planInsTime !=null ">
             , t.plan_ins_time= #{planInsTime}
         </if>
         <if test="actUserName !=null and actUserName != ''">
@@ -202,21 +241,31 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ娲诲姩鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryInspectionTasksCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from inspection_task t
+        from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
         where 1 =1
+        and t.sign_type = td1.status_cd
+        and td1.table_name = 'inspection_task'
+        and td1.table_columns = 'sign_type'
+        and t.state = td2.status_cd
+        and td2.table_name = 'inspection_task'
+        and td2.table_columns = 'state'
+        and ip.inspection_plan_id = t.inspection_plan_id
+        and ip.status_cd = '0'
         <if test="planUserId !=null and planUserId != ''">
             and t.plan_user_id= #{planUserId}
         </if>
-        <if test="actInsTime !=null and actInsTime != ''">
-            and t.act_ins_time= #{actInsTime}
+        <if test="startTime != null">
+            and t.act_ins_time &gt;= #{startTime}
         </if>
-        <if test="planInsTime !=null and planInsTime != ''">
+        <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="statusCd !=null and statusCd != ''">
@@ -231,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}
@@ -246,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>
 
     <!-- 鏌ヨ鏈畨鎺掔殑宸℃璁″垝 -->
@@ -263,10 +322,17 @@
         ip.staff_name planUserName
         FROM
         inspection_plan ip
+        inner join
         LEFT JOIN inspection_task it ON ip.inspection_plan_id = it.inspection_plan_id
         AND ip.staff_id = it.plan_user_id
         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)
+        </if>
+        <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020024'">
+            and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 30 DAY)
+        </if>
         WHERE
         ip.status_cd = '0'
         and ip.end_time &gt; now()
@@ -283,11 +349,20 @@
     <!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="insertInspectionTask" parameterType="Map">
         insert into inspection_task(
-        plan_user_id,plan_ins_time,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,task_id
-        )
+        plan_user_id,plan_ins_time,sign_type,inspection_plan_id,plan_user_name,community_id,b_id,task_id,state,ip_staff_id
+        ) values
         <foreach collection="tasks" item="task" separator=",">
-            (#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId})
+            (#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId},'20200405',#{task.ipStaffId})
         </foreach>
     </insert>
 
+    <!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
+    <insert id="insertInspectionTaskDetail" parameterType="Map">
+        insert into inspection_task_detail(
+        task_detail_id,b_id,community_id,task_id,inspection_id,inspection_name,state
+        ) values
+        <foreach collection="tasks" item="task" separator=",">
+            (#{task.taskDetailId},'-1',#{task.communityId},#{task.taskId},#{task.inspectionId},#{task.inspectionName},'20200405')
+        </foreach>
+    </insert>
 </mapper>

--
Gitblit v1.8.0