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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 f2cf16d..a3e54a1
--- a/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml
@@ -74,9 +74,12 @@
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
+ 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'
--
Gitblit v1.8.0