From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
index 741dde0..8040942 100644
--- a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml
@@ -169,6 +169,7 @@
                 a.regionInspectionId,
                 a.inspectionTime,
                 a.task,
+                a.standard,
                 a.region,
                 a.realName,
                 IF(a.completeRegionNum = a.needRegionNum,"已完成","待巡检") statusName,
@@ -179,6 +180,7 @@
                              t.regionInspectionId,
                              MIN(t.inspectionTime) inspectionTime,
                              tri.task task,
+                             tri.standard standard,
                              GROUP_CONCAT(DISTINCT trhi.region) region,
                              spu.real_name realName,
                              SUM(t.`status`)/(SELECT count(regionInspectionId) FROM t_region_inspection_hazard_inform WHERE regionInspectionId =  t.regionInspectionId) completeRegionNum,

--
Gitblit v1.9.3