From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml | 54 +++++++++++++++++++++---------------------------------
1 files changed, 21 insertions(+), 33 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 d48db4f..a3e54a1
--- a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� 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
+ inspection_id,operate,inspection_route_id,irp_rel_id,community_id,b_id
) values (
- #{inspectionId},#{operate},#{inspectionRouteId},#{irmRelId},#{remark},#{communityId},#{bId}
+ #{inspectionId},#{operate},#{inspectionRouteId},#{irpRelId},#{communityId},#{bId}
)
</insert>
@@ -17,7 +17,7 @@
<!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭紙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
+ inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.community_id,t.community_id
communityId,t.b_id,t.b_id bId
from business_inspection_route_point_rel t
where 1 =1
@@ -30,11 +30,8 @@
<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 test="irpRelId !=null and irpRelId != ''">
+ and t.irp_rel_id= #{irpRelId}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -49,8 +46,8 @@
<!-- 淇濆瓨宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭嚦 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
+ inspection_id,inspection_route_id,irp_rel_id,status_cd,community_id,b_id
+ ) select t.inspection_id,t.inspection_route_id,t.irp_rel_id,'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}
@@ -59,11 +56,8 @@
<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 test="irpRelId !=null and irpRelId != ''">
+ and t.irp_rel_id= #{irpRelId}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -78,11 +72,14 @@
<!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯讳俊鎭� 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
+ 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.machine_id machineId,ip.remark,
- ip.inspection_name inspectionName
+ 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
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'
@@ -92,11 +89,8 @@
<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 test="irpRelId !=null and irpRelId != ''">
+ and t.irp_rel_id= #{irpRelId}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -128,15 +122,12 @@
<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 test="irpRelId !=null and irpRelId != ''">
+ and t.irp_rel_id= #{irpRelId}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -157,11 +148,8 @@
<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 test="irpRelId !=null and irpRelId != ''">
+ and t.irp_rel_id= #{irpRelId}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
--
Gitblit v1.8.0