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/InspectionRoutePointRelServiceDaoImplMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
index a99ff47..ad75060 100644
--- a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
@@ -75,11 +75,15 @@
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,m.location_type_cd locationTypeCd,m.location_obj_id locationObjId
- from inspection_route_point_rel t,inspection_point ip,machine m
+ ip.inspection_name inspectionName,m.location_type_cd locationTypeCd,m.location_obj_id locationObjId,
+ m.machine_code machineCode,m.machine_name machineName,d.name locationTypeName
+ from inspection_route_point_rel t,inspection_point ip,machine m,t_dict d
where 1 =1
and t.inspection_id = ip.inspection_id
and ip.machine_id = m.machine_id
+ and d.status_cd = m.location_type_cd
+ and d.table_name = 'machine'
+ and d.table_columns = 'location_type_cd'
and m.status_cd = '0'
and ip.status_cd = '0'
<if test="inspectionId !=null and inspectionId != ''">
@@ -137,10 +141,13 @@
<!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯绘暟閲� add by wuxw 2018-07-03 -->
<select id="queryInspectionRoutePointRelsCount" parameterType="Map" resultType="Map">
select count(1) count
- from inspection_route_point_rel t,inspection_point ip,machine m
+ from inspection_route_point_rel t,inspection_point ip,machine m,t_dict d
where 1 =1
and t.inspection_id = ip.inspection_id
and ip.machine_id = m.machine_id
+ and d.status_cd = m.location_type_cd
+ and d.table_name = 'machine'
+ and d.table_columns = 'location_type_cd'
and m.status_cd = '0'
and ip.status_cd = '0'
<if test="inspectionId !=null and inspectionId != ''">
--
Gitblit v1.8.0