From 1a7e7a4fad04b984ca5d024933803b698988852b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 15 Dec 2021 10:20:59 +0800
Subject: [PATCH] serviceShowFlag

---
 .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java  | 4 ++++
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java    | 3 +++
 .../src/main/java/com/epmet/controller/ProjectController.java | 1 +
 .../main/java/com/epmet/controller/ResiEventController.java   | 1 +
 4 files changed, 9 insertions(+)

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 06052f22cf..e7b673d22f 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
@@ -88,6 +88,10 @@ public class DemandRecResultDTO implements Serializable {
      * XXX(区域化党建单位)
      */
     private String serviceShowName;
+    /**
+     * 只要有服务方就显示
+     */
+    private Boolean serviceShowFlag;
     /**
      * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
      */
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 e77ff237cd..7fecdb9e18 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
@@ -323,6 +323,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                         res.setServiceShowName(res.getServiceName().concat("(区域化党建单位)"));
                         break;
                 }*/
+                res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId()) ? true : false);
             }
         }
         return new PageData<>(list, pageInfo.getTotal());
@@ -563,6 +564,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
 
             //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
             res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR);
+            res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())?true:false);
         }
         return res;
     }
@@ -772,6 +774,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("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR);
+                res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())?true:false);
             }
         }
         return new PageData<>(list, total);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index db1af3d7a9..070fc8bba0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -301,6 +301,7 @@ public class ProjectController {
 
     /**
      * 个人档案-话题详情-研判分析
+     * 只看来源于议题的项目
      * @param tokenDto
      * @param formDTO
      * @return
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 5ebcafac13..ca48b13304 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -243,6 +243,7 @@ public class ResiEventController {
 
     /**
      * 数据分析-个人档案-上报事件列表-事件详情研判分析
+     * 只看来源于需求上报的项目
      *
      * @param formDTO
      * @return