From 7efe46fa045ffd6730e0865f9f89c716ca8e22d0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Dec 2021 15:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=BF=94=E5=9B=9E=E4=B8=80=E7=BA=A7=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=BC=96=E7=A0=81=E5=92=8C=E4=B8=80=E7=BA=A7=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/demand/DemandRecResultDTO.java      |  3 ++-
 .../service/impl/IcUserDemandRecServiceImpl.java   |  3 ++-
 .../main/resources/mapper/IcUserDemandRecDao.xml   | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index d1eac19bff..feb5c70b84 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -22,7 +22,8 @@ public class DemandRecResultDTO implements Serializable {
     private String categoryCode;
     private String parentCode;
     private String categoryName;
-
+    private String firstCategoryCode;
+    private String firstCategoryName;
 
 
     //社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
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 3ba0fcb8b4..962653db3e 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
@@ -263,7 +263,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 if (null != dictMap && dictMap.containsKey(res.getCategoryCode())) {
                     res.setCategoryName(dictMap.get(res.getCategoryCode()));
                 }
-
+                res.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(), res.getFirstCategoryCode()));
                 if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) {
                     res.setServiceName(userInfoMap.get(res.getServerId()));
                 }
@@ -503,6 +503,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             res.setGridName(gridInfoRes.success() && null != gridInfoRes.getData() ? gridInfoRes.getData().getGridNamePath() : StrConstant.EPMETY_STR);
 
             res.setCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(), res.getCategoryCode()));
+            res.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),res.getFirstCategoryCode()));
             if (UserDemandConstant.VOLUNTEER.equals(res.getServiceType())) {
                 // 如果服务方是志愿者，需要查询小程序端的志愿者姓名
                 List<String> userIdList = Arrays.asList(res.getServerId());
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 67eab8c3f4..85beb700c0 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
@@ -70,7 +70,12 @@
             s.SERVICE_END_TIME as serviceEndTime,
             IFNULL(s.FINISH_DESC,'') as  finishDesc,
             '' AS serviceShowName,
-            s.id as serviceId
+            s.id as serviceId,
+            (
+            case when r.PARENT_CODE !='0' then r.PARENT_CODE
+            ELSE R.CATEGORY_CODE
+            END
+            ) 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' )
@@ -169,7 +174,12 @@
             s.SERVICE_END_TIME as serviceEndTime,
             IFNULL(s.FINISH_DESC,'') as  finishDesc,
             '' AS serviceShowName,
-            s.id as serviceId
+            s.id as serviceId,
+            (
+            case when r.PARENT_CODE !='0' then r.PARENT_CODE
+            ELSE R.CATEGORY_CODE
+            END
+            ) 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' )