From f74c0ace18e83cc2a62acd792412d871a94abad4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 7 Dec 2021 08:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9""mydemand""=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=85=A5=E5=8F=82=E6=96=B0=E5=A2=9EepmetUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/demand/IcResiUserDemandFromDTO.java      | 11 ++++++-----
 .../service/impl/IcUserDemandRecServiceImpl.java      |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

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 ad416293e9..51d334d874 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
@@ -17,12 +17,17 @@ public class IcResiUserDemandFromDTO implements Serializable {
      */
     @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
     private String userId;
+
+    /**
+     * icresiuser/persondata接口返参中有此值
+     */
+    private String epmetUserId;
+
     @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
     private Integer pageNo;
     @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
     private Integer pageSize;
 
-
     /**
      * 研判分析界面，查看同类型的需求可以用此接口，只需传入分类编码
      */
@@ -31,8 +36,4 @@ public class IcResiUserDemandFromDTO implements Serializable {
     @NotBlank(message = "tokenDto获取客户id不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
 
-    /**
-     * 代码内自己查询的参数，赋值到此属性
-     */
-    private String epmetUserId;
 }
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 29f1c20143..0693b7ec7b 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
@@ -40,10 +40,8 @@ import com.epmet.dao.IcUserDemandServiceDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.ResiUserFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
-import com.epmet.dto.result.ResiUserResDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
@@ -467,7 +465,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public PageData<IcResiUserReportDemandRes> queryMyDemand(IcResiUserDemandFromDTO formDTO) {
-        //1、查询当前居民在小程序里是否有用户id
+        /*//1、查询当前居民在小程序里是否有用户id
         ResiUserFormDTO resiUserFormDTO=new ResiUserFormDTO();
         resiUserFormDTO.setCustomerId(formDTO.getCustomerId());
         resiUserFormDTO.setIcResiUserId(formDTO.getUserId());
@@ -475,7 +473,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if(!userRes.success()){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"/epmetuser/user/finduser接口异常","查找居民端小程序用户信息异常");
         }
-        formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());
+        formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());*/
+        //icresiuser/persondata接口已经返回去epmetUserId，这里就不需要再查询了。直接让前端传过来
+
         //2、小程序内自己上报+赋能平台待录入的
         PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO));