需求的研判分析，排除当前的需求详情

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

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

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)){

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>