/heart/userdemand/mydemand返参增加一级分类编码

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;
 }

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());

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,
-            (
+            left(r.CATEGORY_CODE,4) as firstCategoryCode
-            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' )