From 37484f9b07a29f360d3efcd225d7d36549a9dfcc Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 10 Dec 2020 16:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E6=89=93=E5=88=86=E3=80=91=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/SubAuditRecordsLogDTO.java  |  5 +++
 .../mapper/SubAuditRecordsLogDao.xml          | 40 ++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java
index 8bee20844..e82d9a9a1 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java
@@ -109,4 +109,9 @@ public class SubAuditRecordsLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 关联网格名称
+     */
+    private String gridNames;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml
index 1fac5e4e8..21c2f9e71 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml
@@ -22,27 +22,29 @@
 
     <select id="getSubAuditRecordsLogPage" resultType="com.elink.esua.epdc.dto.SubAuditRecordsLogDTO">
         select
-            ID,
-            INFO_ID,
-            CHECK_DEPT_ID,
-            CHECK_DEPT_NAME,
-            CHECK_TIME,
-            CHECK_RESULT,
-            CHECK_OPINION,
-            PROCESS_CODE,
-            PROCESS_NAME,
-            DEL_FLAG,
-            REVISION,
-            CREATED_BY,
-            CREATED_TIME,
-            UPDATED_BY,
-            UPDATED_TIME
-        from epdc_sub_audit_records_log
-        where DEL_FLAG = '0'
+        ll.ID,
+        ll.INFO_ID,
+        ll.CHECK_DEPT_ID,
+        ll.CHECK_DEPT_NAME,
+        ll.CHECK_TIME,
+        ll.CHECK_RESULT,
+        ll.CHECK_OPINION,
+        ll.PROCESS_CODE,
+        ll.PROCESS_NAME,
+        ll.DEL_FLAG,
+        ll.REVISION,
+        ll.CREATED_BY,
+        ll.CREATED_TIME,
+        ll.UPDATED_BY,
+        ll.UPDATED_TIME,
+        ii.GRID_NAMES gridNames
+        from epdc_sub_audit_records_log ll
+        left join epdc_sub_position_check_info ii on ii.ID = ll.INFO_ID and ii.DEL_FLAG = '0'
+        where ll.DEL_FLAG = '0'
         <if test="processCode != null and processCode != ''">
-            and PROCESS_CODE = #{processCode}
+            and ll.PROCESS_CODE = #{processCode}
         </if>
-        order by CREATED_TIME desc
+        order by ll.CREATED_TIME desc
     </select>