From bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:24:47 +0800
Subject: [PATCH] 修复扣款
---
java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 a99ff47..a3e54a1
--- a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
@@ -74,13 +74,14 @@
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.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_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.machine_id = m.machine_id
- and m.status_cd = '0'
and ip.status_cd = '0'
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
@@ -137,11 +138,9 @@
<!-- 鏌ヨ宸℃璺嚎宸℃鐐瑰叧绯绘暟閲� 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
where 1 =1
and t.inspection_id = ip.inspection_id
- and ip.machine_id = m.machine_id
- and m.status_cd = '0'
and ip.status_cd = '0'
<if test="inspectionId !=null and inspectionId != ''">
and t.inspection_id= #{inspectionId}
--
Gitblit v1.8.0