From ff50aff30688613e1a31df89ea765e3f49a40925 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 28 Apr 2023 10:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=83=85=E5=86=B5=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java | 2 ++
 .../esua/epdc/dto/item/result/ItemAppealPageResultDTO.java   | 3 +++
 .../src/main/resources/mapper/item/ItemDao.xml               | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java
index 13a9f78d5..fc43aaec2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java
@@ -155,4 +155,6 @@ public class ItemAppealDetailResultDTO implements Serializable {
 
     private String[] categoryIds;
 
+    private String solutionInfoName;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
index a167729b6..bb2bd5a7f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
@@ -159,4 +159,7 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     private String uniformSocialCreditCode;
 
+    private String solutionInfoName;
+
+    private String solutionInfo;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index b3d5e1e43..283f175a3 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -2109,6 +2109,8 @@
         SELECT i.id,
                 i.NICK_NAME,
                 i.MOBILE,
+                i.SOLUTION_INFO,
+                if(i.SOLUTION_INFO=01,'解决',if(i.SOLUTION_INFO=02,'基本解决',if(i.SOLUTION_INFO=03,'未解决',''))) as solutionInfoName,
                 i.CREATED_TIME,
                 case when (getworkminute(i.CREATED_TIME,now())  / 60 > 8) then '1'
                 when (getworkminute(i.CREATED_TIME,now())   / 60 > 6 and getworkminute(i.CREATED_TIME,now()) / 60 &lt;=8) then '2'
@@ -2392,6 +2394,7 @@
         <result property="evaluationContent" column="EVALUATION_CONTENT"/>
         <result property="evaluationTime" column="EVALUATION_TIME"/>
         <result property="categoryFullCode" column="CATEGORY_FULL_CODE"/>
+        <result property="solutionInfoName" column="solutionInfoName"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -2400,6 +2403,8 @@
             resultMap="appealDetailMap">
         SELECT
             item.ID,
+            item.SOLUTION_INFO,
+            if(item.SOLUTION_INFO=01,'解决',if(item.SOLUTION_INFO=02,'基本解决',if(item.SOLUTION_INFO=03,'未解决',''))) as solutionInfoName,
             item.NICK_NAME,
             item.DISTRIBUTE_TIME,
             item.MOBILE,