From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml | 115 ++++++++++++++++++++++++++-------------------------------
1 files changed, 52 insertions(+), 63 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index c53e14c..6dd5f3e
--- a/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
@@ -7,24 +7,21 @@
<!-- 淇濆瓨宸℃鐐逛俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessInspectionInfo" parameterType="Map">
insert into business_inspection_point
- (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
+ (inspection_id,operate,remark,inspection_name,community_id,b_id,point_obj_type,point_obj_id,point_obj_name,point_start_time,point_end_time)
values
- (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
+ (#{inspectionId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId},#{pointObjType},#{pointObjId},#{pointObjName},#{pointStartTime},#{pointEndTime})
</insert>
-
<!-- 鏌ヨ宸℃鐐逛俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessInspectionInfo" parameterType="Map" resultType="Map">
- select t.inspection_id,t.inspection_id inspectionId,t.machine_id,t.machine_id
- machineId,t.operate,t.remark,t.inspection_name,t.inspection_name inspectionName,t.community_id,t.community_id
- communityId,t.b_id,t.b_id bId
+ select t.inspection_id,t.inspection_id inspectionId,t.operate,t.remark,t.inspection_name,t.inspection_name
+ inspectionName,
+ t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.point_obj_type,t.point_obj_id,t.point_obj_name,
+ t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName,t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime
from business_inspection_point t
where 1 =1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
- </if>
- <if test="machineId !=null and machineId != ''">
- and t.machine_id= #{machineId}
</if>
<if test="operate !=null and operate != ''">
and t.operate= #{operate}
@@ -41,22 +38,20 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</select>
-
<!-- 淇濆瓨宸℃鐐逛俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveInspectionInfoInstance" parameterType="Map">
insert into
inspection_point(
- inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
- ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
+ inspection_id,remark,status_cd,inspection_name,community_id,b_id,
+ point_obj_type,point_obj_id,point_obj_name,point_start_time,point_end_time
+ ) select t.inspection_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id,
+ t.point_obj_type,t.point_obj_id,t.point_obj_name,t.point_start_time,t.point_end_time
+ from
business_inspection_point t where 1=1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
- </if>
- <if test="machineId !=null and machineId != ''">
- and t.machine_id= #{machineId}
</if>
and t.operate= 'ADD'
<if test="remark !=null and remark != ''">
@@ -71,34 +66,30 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</insert>
-
<!-- 鏌ヨ宸℃鐐逛俊鎭� add by wuxw 2018-07-03 -->
<select id="getInspectionInfo" parameterType="Map" resultType="Map">
select
- t.inspection_id,t.inspection_id inspectionId,t.machine_id,
- t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
+ t.inspection_id,t.inspection_id inspectionId,t.remark,t.status_cd,t.status_cd statusCd,
t.inspection_name,t.inspection_name inspectionName,t.community_id,
t.community_id communityId,t.b_id,t.b_id bId,
- m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
- locationObjId,m.machine_id machineId,
- d.name locationTypeName
+ t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
+ t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName,t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime
from inspection_point t
- left join machine m on t.machine_id = m.machine_id and m.status_cd = 0
- left join t_dict d on d.status_cd = m.location_type_cd
<if test="inspectionRouteId != null and inspectionRouteId != ''">
left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
and c.status_cd = '0'
and c.inspection_route_id is null
</if>
- where 1 =1
+ left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
+ td.table_columns = 'point_obj_type'
+ where 1 = 1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
- <if test="machineCode !=null and machineCode != ''">
- and m.machine_code= #{machineCode}
+ <if test="pointObjType !=null and pointObjType != ''">
+ and t.point_obj_type= #{pointObjType}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -120,9 +111,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼宸℃鐐逛俊鎭� add by wuxw 2018-07-03 -->
<update id="updateInspectionInfoInstance" parameterType="Map">
@@ -130,8 +119,14 @@
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
- <if test="machineId !=null and machineId != ''">
- , t.machine_id= #{machineId}
+ <if test="pointObjType !=null and pointObjType != ''">
+ , t.point_obj_type= #{pointObjType}
+ </if>
+ <if test="pointObjId !=null and pointObjId != ''">
+ , t.point_obj_id= #{pointObjId}
+ </if>
+ <if test="pointObjName !=null and pointObjName != ''">
+ , t.point_obj_name= #{pointObjName}
</if>
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
@@ -142,6 +137,12 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
+ <if test="pointStartTime !=null">
+ , t.point_start_time= #{pointStartTime}
+ </if>
+ <if test="pointEndTime !=null">
+ , t.point_end_time= #{pointEndTime}
+ </if>
where 1=1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
@@ -149,7 +150,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ宸℃鐐规暟閲� add by wuxw 2018-07-03 -->
@@ -165,8 +165,8 @@
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
- <if test="machineId !=null and machineId != ''">
- and t.machine_id= #{machineId}
+ <if test="pointObjType !=null and pointObjType != ''">
+ and t.point_obj_type= #{pointObjType}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -175,7 +175,7 @@
and t.status_cd= #{statusCd}
</if>
<if test="inspectionName !=null and inspectionName != ''">
- and t.inspection_name= #{inspectionName}
+ and t.inspection_name like concat('%',#{inspectionName},'%')
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -183,27 +183,22 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
-
</select>
-
<!-- 鏌ヨ宸℃鐐逛俊鎭� add by wuxw 2018-07-03 -->
<select id="getInspectionRelationShipInfo" parameterType="Map" resultType="Map">
select
- t.inspection_id,t.inspection_id inspectionId,t.machine_id,
- t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
+ t.inspection_id,t.inspection_id inspectionId,t.remark,t.status_cd,t.status_cd statusCd,
t.inspection_name,t.inspection_name inspectionName,t.community_id,
t.community_id communityId,t.b_id,t.b_id bId,
- m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
- locationObjId,m.machine_id machineId,
- d.name locationTypeName
+ t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
+ t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName,t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime
from inspection_point t
- inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
- INNER JOIN t_dict d ON d.status_cd = m.location_type_cd and d.table_name = 'machine' and d.table_columns = 'location_type_cd'
- left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and c.inspection_route_id = #{inspectionRouteId}
- where 1 =1
-
+ left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and
+ c.inspection_route_id = #{inspectionRouteId}
+ left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
+ td.table_columns = 'point_obj_type'
+ where 1 = 1
<if test="relationship != null and relationship == 1">
and c.inspection_id is not null
</if>
@@ -213,8 +208,8 @@
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
- <if test="machineCode !=null and machineCode != ''">
- and m.machine_code= #{machineCode}
+ <if test="pointObjType !=null and pointObjType != ''">
+ and t.point_obj_type= #{pointObjType}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -241,11 +236,8 @@
<select id="queryInspectionsRelationShipCount" parameterType="Map" resultType="Map">
select count(1) count
from inspection_point t
- inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
- INNER JOIN t_dict d ON d.status_cd = m.location_type_cd and d.table_name = 'machine' and d.table_columns = 'location_type_cd'
- left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
- and c.status_cd = '0'
- and c.inspection_route_id = #{inspectionRouteId}
+ left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and
+ c.inspection_route_id = #{inspectionRouteId}
where 1 =1
<if test="relationship != null and relationship == 1">
and c.inspection_id is not null
@@ -256,8 +248,8 @@
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
- <if test="machineId !=null and machineId != ''">
- and t.machine_id= #{machineId}
+ <if test="pointObjType !=null and pointObjType != ''">
+ and t.point_obj_type= #{pointObjType}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -266,7 +258,7 @@
and t.status_cd= #{statusCd}
</if>
<if test="inspectionName !=null and inspectionName != ''">
- and t.inspection_name= #{inspectionName}
+ and t.inspection_name like concat('%',#{inspectionName},'%')
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -276,15 +268,13 @@
</if>
</select>
-
-
<!-- 鏌ヨ宸℃鐐逛俊鎭� add by wuxw 2018-07-03 -->
<select id="queryInspectionsByPlan" parameterType="Map" resultType="Map">
select
t.inspection_id,t.inspection_id inspectionId,t.machine_id,
t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
t.inspection_name,t.inspection_name inspectionName,t.community_id,
- t.community_id communityId,t.b_id,t.b_id bId,
+ 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,
m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
locationObjId,m.machine_id machineId,
d.name locationTypeName
@@ -323,5 +313,4 @@
group by t.inspection_id
order by t.create_time desc
</select>
-
</mapper>
--
Gitblit v1.8.0