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/InspectionTaskDetailServiceDaoImplMapper.xml |  322 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 170 insertions(+), 152 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index a6400a9..55d8137
--- a/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionTaskDetailServiceDaoImplMapper.xml
@@ -5,183 +5,201 @@
 <mapper namespace="inspectionTaskDetailServiceDaoImpl">
 
     <!-- 淇濆瓨宸℃浠诲姟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessInspectionTaskDetailInfo" parameterType="Map">
-           insert into business_inspection_task_detail(
-inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id
-) values (
-#{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId}
-)
-       </insert>
+    <insert id="saveBusinessInspectionTaskDetailInfo" parameterType="Map">
+        insert into business_inspection_task_detail(
+        inspection_id,operate,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description
+        ) values (
+        #{inspectionId},#{operate},#{inspectionName},#{state},#{communityId},#{bId},#{taskId},#{taskDetailId},#{patrolType},#{description}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ宸℃浠诲姟鏄庣粏淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
-           select  t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId 
-from business_inspection_task_detail t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
+    <!-- 鏌ヨ宸℃浠诲姟鏄庣粏淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
+        select t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_name,t.inspection_name
+        inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id
+        taskId,t.task_detail_id,t.task_detail_id taskDetailId,t.patrol_type,t.description,t.patrol_type patrolType
+        from business_inspection_task_detail t
+        where 1 =1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨宸℃浠诲姟鏄庣粏淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionTaskDetailInfoInstance" parameterType="Map">
         insert into inspection_task_detail(
-inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id
-) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id from business_inspection_task_detail t where 1=1
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-   and t.operate= 'ADD'
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
+        inspection_id,status_cd,inspection_name,state,community_id,b_id,task_id,task_detail_id,patrol_type,description
+        ) select t.inspection_id,'0',t.inspection_name,t.state,t.community_id,t.b_id,t.task_id,t.task_detail_id,t.patrol_type,t.description
+        from
+        business_inspection_task_detail t where 1=1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ宸℃浠诲姟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getInspectionTaskDetailInfo" parameterType="Map" resultType="Map">
-        select  t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId 
-from inspection_task_detail t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.inspection_id,t.inspection_id inspectionId,t.status_cd,t.status_cd
+        statusCd,t.inspection_name,t.inspection_name inspectionName,t.state,t.community_id,t.community_id
+        communityId,t.b_id,t.b_id bId,t.task_id,t.task_id taskId,t.task_detail_id,t.task_detail_id taskDetailId,
+        td1.name stateName,t.patrol_type,t.description,t.patrol_type patrolType,td2.name patrolTypeName
+        from inspection_task_detail t
+        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 td2.table_columns = 'patrol_type'
+        where 1 =1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
+        <if test="patrolType !=null and patrolType != ''">
+            and t.patrol_type= #{patrolType}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼宸℃浠诲姟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateInspectionTaskDetailInfoInstance" parameterType="Map">
-        update  inspection_task_detail t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="inspectionId !=null and inspectionId != ''">
-, t.inspection_id= #{inspectionId}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-, t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-, t.task_id= #{taskId}
-</if> 
- where 1=1 <if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-and t.task_detail_id= #{taskDetailId}
-</if> 
+        update inspection_task_detail t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="inspectionId !=null and inspectionId != ''">
+            , t.inspection_id= #{inspectionId}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            , t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            , t.task_id= #{taskId}
+        </if>
+        <if test="description !=null and description != ''">
+            , t.description= #{description}
+        </if>
+        <if test="patrolType !=null and patrolType != ''">
+            , t.patrol_type= #{patrolType}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ宸℃浠诲姟鏄庣粏鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_task_detail t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="inspectionName !=null and inspectionName != ''">
-   and t.inspection_name= #{inspectionName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="taskId !=null and taskId != ''">
-   and t.task_id= #{taskId}
-</if> 
-<if test="taskDetailId !=null and taskDetailId != ''">
-   and t.task_detail_id= #{taskDetailId}
-</if> 
+    <select id="queryInspectionTaskDetailsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_task_detail t
+        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 td2.table_columns = 'patrol_type'
+        where 1 =1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="inspectionName !=null and inspectionName != ''">
+            and t.inspection_name= #{inspectionName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="taskId !=null and taskId != ''">
+            and t.task_id= #{taskId}
+        </if>
+        <if test="taskDetailId !=null and taskDetailId != ''">
+            and t.task_detail_id= #{taskDetailId}
+        </if>
+        <if test="patrolType !=null and patrolType != ''">
+            and t.patrol_type= #{patrolType}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0