From 47b85ac7f854169ecd0f55f78bc1cd4f72a1656d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Jun 2022 10:40:39 +0800
Subject: [PATCH] resultName

---
 .../com/epmet/dto/result/EnterprisePatrolResultDTO.java    | 5 +++++
 .../main/resources/mapper/IcEnterprisePatrolRecordDao.xml  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java
index a81ae678d0..1983e80168 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java
@@ -45,6 +45,11 @@ public class EnterprisePatrolResultDTO implements Serializable {
      */
     private String result;
 
+    /**
+     * 检查结果【0:合格 1:不合格】
+     */
+    private String resultName;
+
     /**
      * 隐患明细
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml
index b5ccb55cbe..4c35a0eecf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml
@@ -11,6 +11,7 @@
         <result property="staffName" column="STAFF_NAME"/>
         <result property="mobile" column="MOBILE"/>
         <result property="result" column="RESULT"/>
+        <result property="resultName" column="RESULT_NAME"/>
         <result property="detailed" column="DETAILED"/>
         <result property="reviewTime" column="REVIEW_TIME"/>
         <collection property="imgList" column="ID" ofType="java.lang.String" select="com.epmet.dao.IcEnterprisePatrolAttachmentDao.selectAtt">
@@ -26,6 +27,12 @@
         r.STAFF_NAME,
         r.MOBILE,
         r.RESULT,
+        (
+            case when r.RESULT ='0'then '合格'
+            when r.RESULT='1' then '不合格'
+            else ''
+            end
+        )as RESULT_NAME,
         IFNULL( r.DETAILED, '' ) AS DETAILED,
         r.REVIEW_TIME
     FROM