From b18f1a4558b43f158122a1e4f3ae5a785fb622f7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Dec 2021 14:52:57 +0800
Subject: [PATCH] =?UTF-8?q?/heart/userdemand/mydemand=E8=BF=94=E5=8F=82?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/demand/IcResiUserReportDemandRes.java     | 3 +++
 .../epmet/service/impl/IcUserDemandRecServiceImpl.java   | 1 +
 .../src/main/resources/mapper/IcUserDemandRecDao.xml     | 9 +++------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
index e4792920b3..869f1b01e9 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
@@ -30,4 +30,7 @@ public class IcResiUserReportDemandRes implements Serializable {
     private String status;
 
     private String statusName;
+
+    private String firstCategoryCode;
+    private String firstCategoryName;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 9f37c99a6a..b3b746eff1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -498,6 +498,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 if (null != dictMap && dictMap.containsKey(resDto.getCategoryCode())) {
                     resDto.setCategoryName(dictMap.get(resDto.getCategoryCode()));
                 }
+                resDto.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),resDto.getFirstCategoryCode()));
             }
         }
         return new PageData<>(list, pageInfo.getTotal());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 33d491e2b4..e4ac17efca 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -129,7 +129,8 @@
             r.PARENT_CODE as parentCode,
             r.CONTENT,
             r.`STATUS`,
-            r.WANT_SERVICE_TIME as wantServiceTime
+            r.WANT_SERVICE_TIME as wantServiceTime,
+            left(r.CATEGORY_CODE,4) as firstCategoryCode
         FROM
             ic_user_demand_rec r
         WHERE
@@ -181,11 +182,7 @@
             IFNULL(s.FINISH_DESC,'') as  finishDesc,
             '' AS serviceShowName,
             s.id as serviceId,
-            (
-            case when r.PARENT_CODE !='0' then r.PARENT_CODE
-            ELSE R.CATEGORY_CODE
-            END
-            ) as firstCategoryCode
+            left(r.CATEGORY_CODE,4) as firstCategoryCode
         FROM
             ic_user_demand_rec r
             left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )