From cddd83f139af1786517759277ced8479cbe80d3b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 12:57:09 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml |  299 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 153 insertions(+), 146 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml
index 020856d..1598812 100644
--- a/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRouteServiceDaoImplMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="inspectionRouteServiceDaoImpl">
 
     <!-- 淇濆瓨宸℃璺嚎淇℃伅 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessInspectionRouteInfo" parameterType="Map">
+    <insert id="saveBusinessInspectionRouteInfo" parameterType="Map">
            insert into business_inspection_route(
 operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b_id,Route_name
 ) values (
@@ -14,174 +14,181 @@
        </insert>
 
 
-       <!-- 鏌ヨ宸℃璺嚎淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessInspectionRouteInfo" parameterType="Map" resultType="Map">
-           select  t.operate,t.inspection_routeId,t.inspection_routeId inspectionRouteId,t.check_quantity,t.check_quantity checkQuantity,t.machine_quantity,t.machine_quantity machineQuantity,t.remark,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.Route_name,t.Route_name routeName 
-from business_inspection_route t 
-where 1 =1 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_routeId= #{inspectionRouteId}
-</if> 
-<if test="checkQuantity !=null and checkQuantity != ''">
-   and t.check_quantity= #{checkQuantity}
-</if> 
-<if test="machineQuantity !=null and machineQuantity != ''">
-   and t.machine_quantity= #{machineQuantity}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</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="routeName !=null and routeName != ''">
-   and t.Route_name= #{routeName}
-</if> 
+    <!-- 鏌ヨ宸℃璺嚎淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessInspectionRouteInfo" parameterType="Map" resultType="Map">
+        select t.operate,t.inspection_route_Id,t.inspection_route_Id inspectionRouteId,t.check_quantity,t.check_quantity
+        checkQuantity,t.machine_quantity,t.machine_quantity machineQuantity,t.remark,t.community_id,t.community_id
+        communityId,t.b_id,t.b_id bId,t.Route_name,t.Route_name routeName
+        from business_inspection_route t
+        where 1 =1
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_Id= #{inspectionRouteId}
+        </if>
+        <if test="checkQuantity !=null and checkQuantity != ''">
+            and t.check_quantity= #{checkQuantity}
+        </if>
+        <if test="machineQuantity !=null and machineQuantity != ''">
+            and t.machine_quantity= #{machineQuantity}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </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="routeName !=null and routeName != ''">
+            and t.Route_name= #{routeName}
+        </if>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨宸℃璺嚎淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionRouteInfoInstance" parameterType="Map">
         insert into inspection_route(
-inspection_routeId,check_quantity,machine_quantity,remark,status_cd,community_id,b_id,Route_name
-) select t.inspection_routeId,t.check_quantity,t.machine_quantity,t.remark,'0',t.community_id,t.b_id,t.Route_name from business_inspection_route t where 1=1
-   and t.operate= 'ADD'
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_routeId= #{inspectionRouteId}
-</if> 
-<if test="checkQuantity !=null and checkQuantity != ''">
-   and t.check_quantity= #{checkQuantity}
-</if> 
-<if test="machineQuantity !=null and machineQuantity != ''">
-   and t.machine_quantity= #{machineQuantity}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</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="routeName !=null and routeName != ''">
-   and t.Route_name= #{routeName}
-</if> 
+        inspection_routeId,check_quantity,machine_quantity,remark,status_cd,community_id,b_id,Route_name
+        ) select
+        t.inspection_route_Id,t.check_quantity,t.machine_quantity,t.remark,'0',t.community_id,t.b_id,t.Route_name from
+        business_inspection_route t where 1=1
+        and t.operate= 'ADD'
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_Id= #{inspectionRouteId}
+        </if>
+        <if test="checkQuantity !=null and checkQuantity != ''">
+            and t.check_quantity= #{checkQuantity}
+        </if>
+        <if test="machineQuantity !=null and machineQuantity != ''">
+            and t.machine_quantity= #{machineQuantity}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </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="routeName !=null and routeName != ''">
+            and t.Route_name= #{routeName}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ宸℃璺嚎淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getInspectionRouteInfo" parameterType="Map" resultType="Map">
-        select  t.inspection_routeId,t.inspection_routeId inspectionRouteId,t.check_quantity,t.check_quantity checkQuantity,t.machine_quantity,t.machine_quantity machineQuantity,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.Route_name,t.Route_name routeName 
-from inspection_route t 
-where 1 =1 
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_routeId= #{inspectionRouteId}
-</if> 
-<if test="checkQuantity !=null and checkQuantity != ''">
-   and t.check_quantity= #{checkQuantity}
-</if> 
-<if test="machineQuantity !=null and machineQuantity != ''">
-   and t.machine_quantity= #{machineQuantity}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</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="routeName !=null and routeName != ''">
-   and t.Route_name= #{routeName}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.inspection_route_Id,t.inspection_route_Id inspectionRouteId,t.check_quantity,t.check_quantity
+        checkQuantity,t.machine_quantity,t.machine_quantity machineQuantity,t.remark,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.Route_name,t.Route_name routeName
+        from inspection_route t
+        where 1 =1
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_Id= #{inspectionRouteId}
+        </if>
+        <if test="checkQuantity !=null and checkQuantity != ''">
+            and t.check_quantity= #{checkQuantity}
+        </if>
+        <if test="machineQuantity !=null and machineQuantity != ''">
+            and t.machine_quantity= #{machineQuantity}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </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="routeName !=null and routeName != ''">
+            and t.Route_name= #{routeName}
+        </if>
+        <if test="inspectionRouteIds !=null">
+            and t.inspection_route_Id in
+            <foreach collection="inspectionRouteIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </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="updateInspectionRouteInfoInstance" parameterType="Map">
-        update  inspection_route t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="checkQuantity !=null and checkQuantity != ''">
-, t.check_quantity= #{checkQuantity}
-</if> 
-<if test="machineQuantity !=null and machineQuantity != ''">
-, t.machine_quantity= #{machineQuantity}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="routeName !=null and routeName != ''">
-, t.Route_name= #{routeName}
-</if> 
- where 1=1 <if test="inspectionRouteId !=null and inspectionRouteId != ''">
-and t.inspection_routeId= #{inspectionRouteId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update inspection_route t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="checkQuantity !=null and checkQuantity != ''">
+            , t.check_quantity= #{checkQuantity}
+        </if>
+        <if test="machineQuantity !=null and machineQuantity != ''">
+            , t.machine_quantity= #{machineQuantity}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="routeName !=null and routeName != ''">
+            , t.Route_name= #{routeName}
+        </if>
+        where 1=1
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_Id= #{inspectionRouteId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ宸℃璺嚎鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryInspectionRoutesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_route t 
-where 1 =1 
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_routeId= #{inspectionRouteId}
-</if> 
-<if test="checkQuantity !=null and checkQuantity != ''">
-   and t.check_quantity= #{checkQuantity}
-</if> 
-<if test="machineQuantity !=null and machineQuantity != ''">
-   and t.machine_quantity= #{machineQuantity}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</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="routeName !=null and routeName != ''">
-   and t.Route_name= #{routeName}
-</if> 
+    <select id="queryInspectionRoutesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_route t
+        where 1 =1
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_Id= #{inspectionRouteId}
+        </if>
+        <if test="checkQuantity !=null and checkQuantity != ''">
+            and t.check_quantity= #{checkQuantity}
+        </if>
+        <if test="machineQuantity !=null and machineQuantity != ''">
+            and t.machine_quantity= #{machineQuantity}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </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="routeName !=null and routeName != ''">
+            and t.Route_name= #{routeName}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0