From 04f9bb0933b527b7fd6c6f1c82f821e0973ea3a6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 15 Dec 2021 11:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=9A=84=E7=A0=94=E5=88=A4?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=EF=BC=8C=E6=8E=92=E9=99=A4=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E9=9C=80=E6=B1=82=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/demand/DemandResearchAnalysisFormDTO.java      | 5 +++++
 .../com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java  | 6 ++++++
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java  | 1 +
 .../src/main/resources/mapper/IcUserDemandRecDao.xml        | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java
index a6adc0a695..893a383708 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java
@@ -38,4 +38,9 @@ public class DemandResearchAnalysisFormDTO implements Serializable {
      */
     @NotBlank(message = "queryOrigin不能为空：个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class)
     private String queryOrigin;
+
+    /**
+     * 当前查看的需求详情的需求id
+     */
+    private String demandRecId;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
index 4589bbd9ed..ea0f862854 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
@@ -41,4 +41,10 @@ public class IcResiUserDemandFromDTO implements Serializable {
      * epmetUserIdList+userId
      */
     private List<String> userIds;
+
+
+    /**
+     * 当前查看的需求详情的需求id 可空
+     */
+    private String demandRecId;
 }
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 7fecdb9e18..e66cb7cdc9 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
@@ -623,6 +623,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         IcResiUserDemandFromDTO icResiUserDemandFromDTO=new IcResiUserDemandFromDTO();
         icResiUserDemandFromDTO.setUserIds(userIds);
         icResiUserDemandFromDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode());
+        icResiUserDemandFromDTO.setDemandRecId(formDTO.getDemandRecId());
         List<IcResiUserReportDemandRes> demandList =  baseDao.selectUserDemand(icResiUserDemandFromDTO);
 
         if(CollectionUtils.isNotEmpty(demandList)){
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 9e66aa8abc..11d3190a6c 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
@@ -152,6 +152,9 @@
             <if test="null !=firstCategoryCode and firstCategoryCode!=''">
                 and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')
             </if>
+            <if test="null !=demandRecId and demandRecId!=''">
+                and r.id !=#{demandRecId}
+            </if>
         ORDER BY
             r.WANT_SERVICE_TIME DESC
     </select>