From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml |  280 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 143 insertions(+), 137 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 6836214..518bfc0
--- a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
@@ -5,168 +5,174 @@
 <mapper namespace="inspectionRoutePointRelServiceDaoImpl">
 
     <!-- 淇濆瓨宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessInspectionRoutePointRelInfo" parameterType="Map">
-           insert into business_inspection_route_point_rel(
-inspection_id,operate,inspection_route_id,irm_rel_id,remark,community_id,b_id
-) values (
-#{inspectionId},#{operate},#{inspectionRouteId},#{irmRelId},#{remark},#{communityId},#{bId}
-)
-       </insert>
+    <insert id="saveBusinessInspectionRoutePointRelInfo" parameterType="Map">
+        insert into business_inspection_route_point_rel(
+        inspection_id,operate,inspection_route_id,irp_rel_id,community_id,b_id,point_start_time,point_end_time,sort_number
+        ) values (
+        #{inspectionId},#{operate},#{inspectionRouteId},#{irpRelId},#{communityId},#{bId},#{pointStartTime},#{pointEndTime},#{sortNumber}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭紙Business锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
-           select  t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_route_id,t.inspection_route_id inspectionRouteId,t.irm_rel_id,t.irm_rel_id irmRelId,t.remark,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
-from business_inspection_route_point_rel 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="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_route_id= #{inspectionRouteId}
-</if> 
-<if test="irmRelId !=null and irmRelId != ''">
-   and t.irm_rel_id= #{irmRelId}
-</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> 
+    <!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭紙Business锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
+        select t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_route_id,t.inspection_route_id
+        inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.community_id,t.community_id
+        communityId,t.b_id,t.b_id bId,t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber
+        from business_inspection_route_point_rel 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="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_id= #{inspectionRouteId}
+        </if>
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
+        </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>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionRoutePointRelInfoInstance" parameterType="Map">
         insert into inspection_route_point_rel(
-inspection_id,inspection_route_id,irm_rel_id,remark,status_cd,community_id,b_id
-) select t.inspection_id,t.inspection_route_id,t.irm_rel_id,t.remark,'0',t.community_id,t.b_id from business_inspection_route_point_rel t where 1=1
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-   and t.operate= 'ADD'
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_route_id= #{inspectionRouteId}
-</if> 
-<if test="irmRelId !=null and irmRelId != ''">
-   and t.irm_rel_id= #{irmRelId}
-</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> 
+        inspection_id,inspection_route_id,irp_rel_id,status_cd,community_id,b_id,point_start_time,point_end_time,sort_number
+        ) select t.inspection_id,t.inspection_route_id,t.irp_rel_id,'0',t.community_id,t.b_id,t.point_start_time,t.point_end_time,t.sort_number from
+        business_inspection_route_point_rel t where 1=1
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_id= #{inspectionRouteId}
+        </if>
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
+        </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>
 
     </insert>
 
 
-
     <!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� add by wuxw 2018-07-03 -->
     <select id="getInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
-        select  t.inspection_id,t.inspection_id inspectionId,t.inspection_route_id,t.inspection_route_id inspectionRouteId,t.irm_rel_id,t.irm_rel_id irmRelId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
-from inspection_route_point_rel t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_route_id= #{inspectionRouteId}
-</if> 
-<if test="irmRelId !=null and irmRelId != ''">
-   and t.irm_rel_id= #{irmRelId}
-</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> 
-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.inspection_route_id,t.inspection_route_id
+        inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+        ip.inspection_id inspectionId,ip.remark,td.name pointTypeName,
+        ip.inspection_name inspectionName,ip.point_obj_type,ip.point_obj_id,ip.point_obj_name,
+        ip.point_obj_type pointObjType,ip.point_obj_id pointObjId,ip.point_obj_name pointObjName,
+        t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber
+        from inspection_route_point_rel t,inspection_point ip
+        left join t_dict td on ip.point_obj_type = td.status_cd and td.table_name = 'inspection_point'
+        and td.table_columns = 'point_obj_type'
+        where 1 =1
+        and t.inspection_id = ip.inspection_id
+        and ip.status_cd = '0'
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_id= #{inspectionRouteId}
+        </if>
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+            and ip.community_id = #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        order by t.sort_number desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateInspectionRoutePointRelInfoInstance" parameterType="Map">
-        update  inspection_route_point_rel 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="inspectionRouteId !=null and inspectionRouteId != ''">
-, t.inspection_route_id= #{inspectionRouteId}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="irmRelId !=null and irmRelId != ''">
-and t.irm_rel_id= #{irmRelId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update inspection_route_point_rel 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="inspectionRouteId !=null and inspectionRouteId != ''">
+            , t.inspection_route_id= #{inspectionRouteId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="pointStartTime !=null and pointStartTime != ''">
+            , t.point_start_time= #{pointStartTime}
+        </if>
+        <if test="pointEndTime !=null and pointEndTime != ''">
+            , t.point_end_time= #{pointEndTime}
+        </if>
+        <if test="sortNumber !=null and sortNumber != ''">
+            , t.sort_number= #{sortNumber}
+        </if>
+        where 1=1
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯绘暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryInspectionRoutePointRelsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_route_point_rel t 
-where 1 =1 
-<if test="inspectionId !=null and inspectionId != ''">
-   and t.inspection_id= #{inspectionId}
-</if> 
-<if test="inspectionRouteId !=null and inspectionRouteId != ''">
-   and t.inspection_route_id= #{inspectionRouteId}
-</if> 
-<if test="irmRelId !=null and irmRelId != ''">
-   and t.irm_rel_id= #{irmRelId}
-</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> 
+    <select id="queryInspectionRoutePointRelsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_route_point_rel t,inspection_point ip
+        where 1 =1
+        and t.inspection_id = ip.inspection_id
+        and ip.status_cd = '0'
+        <if test="inspectionId !=null and inspectionId != ''">
+            and t.inspection_id= #{inspectionId}
+        </if>
+        <if test="inspectionRouteId !=null and inspectionRouteId != ''">
+            and t.inspection_route_id= #{inspectionRouteId}
+        </if>
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+            and ip.community_id = #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0