From 022ffe220344d387380fad4ffe33ebcf318c6eab Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 09 七月 2020 10:42:08 +0800
Subject: [PATCH] 优化错别字
---
java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 162 insertions(+), 14 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
index 21a7693..b6d15f4 100644
--- a/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
@@ -7,10 +7,10 @@
<!-- 淇濆瓨宸℃鐐逛俊鎭� 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)
- values
- (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
- </insert>
+ (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
+ values
+ (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
+ </insert>
<!-- 鏌ヨ宸℃鐐逛俊鎭紙Business锛� add by wuxw 2018-07-03 -->
@@ -48,10 +48,10 @@
<!-- 淇濆瓨宸℃鐐逛俊鎭嚦 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
- business_inspection_point t where 1=1
+ 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
+ business_inspection_point t where 1=1
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
</if>
@@ -78,15 +78,21 @@
<!-- 鏌ヨ宸℃鐐逛俊鎭� 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_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.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,
+ m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
+ locationObjId,m.machine_id machineId,
+ d.name locationTypeName
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
+ <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
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
@@ -150,6 +156,11 @@
<select id="queryInspectionsCount" parameterType="Map" resultType="Map">
select count(1) count
from inspection_point t
+ <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
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
@@ -176,4 +187,141 @@
</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_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
+ 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
+
+ <if test="relationship != null and relationship == 1">
+ and c.inspection_id is not null
+ </if>
+ <if test="relationship != null and relationship == 0">
+ and c.inspection_id is null
+ </if>
+ <if test="inspectionId !=null and inspectionId != ''">
+ and t.inspection_id= #{inspectionId}
+ </if>
+ <if test="machineCode !=null and machineCode != ''">
+ and m.machine_code= #{machineCode}
+ </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="inspectionName !=null and inspectionName != ''">
+ and t.inspection_name like concat('%',#{inspectionName},'%')
+ </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>
+
+ <!-- 鏌ヨ宸℃鐐规暟閲� add by wuxw 2018-07-03 -->
+ <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}
+ where 1 =1
+ <if test="relationship != null and relationship == 1">
+ and c.inspection_id is not null
+ </if>
+ <if test="relationship != null and relationship == 0">
+ and c.inspection_id is null
+ </if>
+ <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="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </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="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </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,
+ m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
+ locationObjId,m.machine_id machineId,
+ d.name locationTypeName
+ from inspection_point t,machine m,t_dict d,inspection_route_point_rel c,inspection_plan ip
+ where 1 =1
+ and t.machine_id = m.machine_id
+ and m.status_cd = 0
+ and d.status_cd = m.location_type_cd
+ and d.table_name = 'machine'
+ and d.table_columns = 'location_type_cd'
+ and t.inspection_id = c.inspection_id
+ and c.status_cd = '0'
+ and c.inspection_route_id = ip.inspection_route_id
+ and ip.inspection_plan_id = #{inspectionPlanId}
+ <if test="inspectionId !=null and inspectionId != ''">
+ and t.inspection_id= #{inspectionId}
+ </if>
+ <if test="machineCode !=null and machineCode != ''">
+ and m.machine_code= #{machineCode}
+ </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="inspectionName !=null and inspectionName != ''">
+ and t.inspection_name like concat('%',#{inspectionName},'%')
+ </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>
+ group by t.inspection_id
+ order by t.create_time desc
+ </select>
+
</mapper>
--
Gitblit v1.8.0