Merge remote-tracking branch 'origin/dev_ic_v2' into develop

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

@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class IcResiUserDemandFromDTO implements Serializable {
@@ -21,7 +22,7 @@ public class IcResiUserDemandFromDTO implements Serializable {
     /**
      * icresiuser/persondata接口返参中有此值
      */
-    private String epmetUserId;
+    private List<String> epmetUserIdList;
 
     @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
     private Integer pageNo;
@@ -36,4 +37,8 @@ public class IcResiUserDemandFromDTO implements Serializable {
     @NotBlank(message = "tokenDto获取客户id不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
 
+    /**
+     * epmetUserIdList+userId
+     */
+    private List<String> userIds;
 }

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

@@ -475,7 +475,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());*/
         //icresiuser/persondata接口已经返回去epmetUserId，这里就不需要再查询了。直接让前端传过来
-
+        List<String> userIds=new ArrayList<>();
+        userIds.add(formDTO.getUserId());
+        if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
+            userIds.addAll(formDTO.getEpmetUserIdList());
+        }
         //2、小程序内自己上报+赋能平台待录入的
         PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO));

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

@@ -134,14 +134,10 @@
             ic_user_demand_rec r
         WHERE
             r.DEL_FLAG = '0'
-            <choose>
+            AND r.DEMAND_USER_ID in
-                <when test="null!=epmetUserId and epmetUserId!='' ">
+            <foreach item="demandUserId" collection="userIds" open="(" separator="," close=")">
-                    AND (r.DEMAND_USER_ID = #{userId} or r.DEMAND_USER_ID=#{epmetUserId})
+                #{demandUserId}
-                </when>
+            </foreach>
-                <otherwise>
-                    AND r.DEMAND_USER_ID = #{userId}
-                </otherwise>
-            </choose>
             <if test="null !=firstCategoryCode and firstCategoryCode!=''">
                 and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')
             </if>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java

@@ -21,7 +21,7 @@ public class PersonDataResultDTO implements Serializable {
     /**
      * epemt_user.user.id
      */
-    private String epmetUserId;
+    private List<String> epmetUserIdList;
 
     /**
      * ic_resi_user.id

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java

@@ -1,15 +1,16 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.form.ResiUserFormDTO;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
+/**
+ * 根据ic_resi_user找 epmetUser
+ */
 @Data
 public class ResiUserResDTO implements Serializable {
     private String idNum;
     private String customerId;
-    private String epmetUserId;
+    private List<String> epmetUserIdList;
-    private String icResiUserId;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -26,6 +26,8 @@ import com.epmet.entity.UserBaseInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 用户基础信息
  *
@@ -82,9 +84,8 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      **/
     String selectIdByUserId(@Param("userId") String userId);
 
-    UserBaseInfoDTO selectUserId(@Param("customerId") String customerId,
+    List<UserBaseInfoDTO> selectCommonIdNumUser(@Param("customerId") String customerId,
-                                 @Param("idNum")String idNum,
+                                       @Param("idNum")String idNum);
-                                 @Param("userId")String userId);
 
     Integer selectCountIdNum(@Param("idNum") String idNum,
                              @Param("customerId")String customerId,

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@@ -106,7 +106,6 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 							   @Param("customerId") String customerId,
 							   @Param("excludeUserId")String excludeUserId);
 
-	UserResiInfoDTO selectByIdNum(@Param("customerId") String customerId,
+	List<UserResiInfoDTO> selectCommonIdNumUser(@Param("customerId") String customerId,
-								  @Param("idNum")String idNum,
+								  @Param("idNum")String idNum);
-								  @Param("userId")String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -190,7 +190,7 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
     **/
     ExtUserInfoResultDTO extUserInfo(CommonUserIdFormDTO param);
 
-    UserBaseInfoDTO getUserIdByIdNum(String customerId, String idNum,String userId);
+    List<UserBaseInfoDTO> getCommonIdNumUser(String customerId, String idNum);
 
     @Deprecated
     Integer checkIdNum(String idNum, String customerId, String excludeUserId);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -538,7 +538,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         resiUserFormDTO.setCustomerId(formDTO.getCustomerId());
         //根据身份证号+ic_resi_user.id找epmetUserId
         ResiUserResDTO resiUserResDTO = userService.findEpmetUser(resiUserFormDTO);
-        personData.setEpmetUserId(null != resiUserResDTO ? resiUserResDTO.getEpmetUserId() : StrConstant.EPMETY_STR);
+        personData.setEpmetUserIdList(null != resiUserResDTO ? resiUserResDTO.getEpmetUserIdList() : new ArrayList<>());
         personData.setIcResiUserId(formDTO.getUserId());
 
         // 房屋信息查询

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -444,11 +444,11 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     }
 
     @Override
-    public UserBaseInfoDTO getUserIdByIdNum(String customerId, String idNum,String userId) {
+    public List<UserBaseInfoDTO> getCommonIdNumUser(String customerId, String idNum) {
-        if(StringUtils.isBlank(idNum)&&StringUtils.isBlank(userId)){
+        if(StringUtils.isBlank(idNum)){
             return null;
         }
-        return baseDao.selectUserId(customerId,idNum,userId);
+        return baseDao.selectCommonIdNumUser(customerId,idNum);
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -2,7 +2,6 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
@@ -26,13 +25,17 @@ import com.epmet.service.IcResiUserService;
 import com.epmet.service.UserBaseInfoService;
 import com.epmet.service.UserService;
 import com.epmet.util.ModuleConstant;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -370,15 +373,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class);
         if (StringUtils.isNotBlank(formDTO.getIdNum())) {
-            UserBaseInfoDTO userBaseInfoDTO = userBaseInfoService.getUserIdByIdNum(formDTO.getCustomerId(),
+            List<UserBaseInfoDTO> userBaseInfoList = userBaseInfoService.getCommonIdNumUser(formDTO.getCustomerId(),formDTO.getIdNum());
-                    formDTO.getIdNum(), null);
+            if (CollectionUtils.isEmpty(userBaseInfoList)) {
-            if (null == userBaseInfoDTO || StringUtils.isBlank(userBaseInfoDTO.getUserId())) {
                 log.info("user_base_info没有找到,去查下user_resi_info表吧");
-                UserResiInfoDTO userResiInfoDTO = userResiInfoDao.selectByIdNum(formDTO.getCustomerId(),
+                List<UserResiInfoDTO> userResiInfoDTO = userResiInfoDao.selectCommonIdNumUser(formDTO.getCustomerId(),formDTO.getIdNum());
-                        formDTO.getIdNum(), null);
+                resiUserResDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(userResiInfoDTO) ? userResiInfoDTO.stream().map(UserResiInfoDTO::getUserId).collect(Collectors.toList()): new ArrayList<>());
-                resiUserResDTO.setEpmetUserId(null != userResiInfoDTO ? userResiInfoDTO.getId() : StrConstant.EPMETY_STR);
             } else {
-                resiUserResDTO.setEpmetUserId(userBaseInfoDTO.getUserId());
+                resiUserResDTO.setEpmetUserIdList(userBaseInfoList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList()));
             }
         }
         return resiUserResDTO;

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -121,18 +121,13 @@
         AND USER_ID = #{userId}
     </select>
 
-    <select id="selectUserId" parameterType="map" resultType="com.epmet.dto.UserBaseInfoDTO">
+    <select id="selectCommonIdNumUser" parameterType="map" resultType="com.epmet.dto.UserBaseInfoDTO">
         SELECT
           *
         FROM user_base_info
         WHERE DEL_FLAG = '0'
         AND customer_id = #{customerId}
-        <if test="idNum != null and idNum != ''">
+        and id_num=#{idNum}
-            and id_num=#{idNum}
-        </if>
-        <if test="userId != null and userId != ''">
-            and user_id=#{userId}
-        </if>
     </select>
 
     <select id="selectCountIdNum" parameterType="map" resultType="java.lang.Integer">

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -191,7 +191,7 @@
             </if>
     </select>
 
-    <select id="selectByIdNum" parameterType="map" resultType="com.epmet.dto.UserResiInfoDTO">
+    <select id="selectCommonIdNumUser" parameterType="map" resultType="com.epmet.dto.UserResiInfoDTO">
         SELECT
            uri.*
         FROM
@@ -199,11 +199,6 @@
         WHERE
             uri.DEL_FLAG = '0'
             and uri.customer_id=#{customerId}
-            <if test="idNum != null and idNum != ''">
+            AND uri.id_num = #{idNum}
-                AND uri.id_num = #{idNum}
-            </if>
-            <if test="userId != null and userId != ''">
-                and uri.user_id=#{userId}
-            </if>
     </select>
 </mapper>