列表和详情需要返回一级分类编码和一级分类名称

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java

@@ -23,6 +23,11 @@ public class IcResiUserDemandFromDTO implements Serializable {
     private Integer pageSize;
 
 
+    /**
+     * 研判分析界面，查看同类型的需求可以用此接口，只需传入分类编码
+     */
+    private String firstCategoryCode;
+
     @NotBlank(message = "tokenDto获取客户id不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -303,7 +303,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                         break;
                 }*/
                  //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
-                res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat(serviceTypeMap.get(res.getServiceType())):StrConstant.EPMETY_STR);
+                res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR);
                 /*switch(res.getServiceType()){
                     case UserDemandConstant.VOLUNTEER :
                         res.setServiceShowName(res.getServiceName().concat("(志愿者)"));
@@ -530,7 +530,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             res.setStatusName(statusMap.containsKey(res.getStatus()) ? statusMap.get(res.getStatus()) : StrConstant.EPMETY_STR);
 
             //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
-            res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat(serviceTypeMap.get(res.getServiceType())) : StrConstant.EPMETY_STR);
+            res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR);
         }
         return res;
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -135,6 +135,9 @@
         WHERE
             r.DEL_FLAG = '0'
             AND r.DEMAND_USER_ID = #{userId}
+            <if test="null !=firstCategoryCode and firstCategoryCode!=''">
+                and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')
+            </if>
         ORDER BY
             r.WANT_SERVICE_TIME DESC
     </select>