From bb3ccc403fc6ecef5eac85de1528d6f244769e43 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 13 Sep 2022 17:20:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E6=B0=B4=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-cloud-commons-shibei                         | 2 +-
 .../esua/epdc/dto/item/result/ItemDetailResultDTO.java      | 6 ++++++
 .../com/elink/esua/epdc/dto/item/result/ItemResultDTO.java  | 6 ++++++
 .../src/main/resources/mapper/item/ItemDao.xml              | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index 896a3cc0f..8f098d155 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit 896a3cc0f925815d096ba4b93c07a0e6bce662f4
+Subproject commit 8f098d15559c1f17a9c507eac39475620b667ac2
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
index e444c43b4..dae304754 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
@@ -150,4 +150,10 @@ public class ItemDetailResultDTO implements Serializable {
      * 满意度评价内容
      */
     private String evaluationContent;
+
+    /**
+     * 流水号
+     */
+    private String serialNum;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
index 11417b757..9fff8e251 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
@@ -90,6 +90,12 @@ public class ItemResultDTO implements Serializable {
      * 是否是诉求上报:0否1是
      */
     private String isPeople;
+
+    /**
+     * 流水号
+     */
+    private String serialNum;
+
     /**
      * 最新进展
      */
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 144d6098f..81cde0ffe 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
@@ -22,6 +22,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="statementNum" column="statementNum"/>
         <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="serialNum" column="SERIAL_NUM"/>
         <result property="isPeople" column="IS_PEOPLE"/>
         <result property="peopleFlag" column="PEOPLE_FLAG"/>
         <result property="latestProgress.progressName" column="stateName"/>
@@ -373,6 +374,7 @@
         <result property="statementNum" column="statementNum"/>
         <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="firstCategoryCode" column="FIRST_CATEGORY_CODE"/>
+        <result property="serialNum" column="SERIAL_NUM"/>
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
         <result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
@@ -389,6 +391,7 @@
               (ua.attitude_flag = 1) userDislike,
             </if>
             item.ID,
+            item.SERIAL_NUM,
             item.EVALUATION_SCORE,
             item.EVALUATION_CONTENT,
             item.EVENT_ID,
@@ -1358,6 +1361,7 @@
         eve.APPROVE_NUM,
         eve.OPPOSE_NUM,
         eve.COMMENT_NUM,
+        item.SERIAL_NUM,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
         cate.CATEGORY_NAME,
         img.IMG_URL,