From 3fa03b586cce9c0d24d54ed9397554a4076cf148 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 10:34:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91=E3=80=81=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E4=B9=8B=E8=87=AA=E5=8A=A8=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=B1=85=E6=B0=91=E9=83=BD=E4=B8=8D=E5=86=8D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=86=85=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonalCenterController.java | 4 +++ .../impl/PersonalCenterServiceImpl.java | 2 -- .../com/epmet/dto/form/EditInfoFormDTO.java | 22 +++++++++----- .../com/epmet/dto/form/InfoSubmitFromDTO.java | 2 +- .../controller/UserResiInfoController.java | 1 + .../epmet/service/UserBaseInfoService.java | 1 + .../service/impl/UserResiInfoServiceImpl.java | 30 ++++++++++--------- 7 files changed, 37 insertions(+), 25 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java index e71b28101f..48ea31f06b 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java @@ -3,6 +3,7 @@ package com.epmet.modules.mine.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.EditInfoFormDTO; import com.epmet.dto.form.EditMobileFormDTO; import com.epmet.dto.form.SendCodeFormDTO; @@ -51,6 +52,9 @@ public class PersonalCenterController { */ @PostMapping("editinfo") public Result editInfo(@LoginUser TokenDto tokenDto, @RequestBody EditInfoFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,EditInfoFormDTO.AddUserShowGroup.class,EditInfoFormDTO.AddUserInternalGroup.class); personalCenterService.editInfo(tokenDto, formDTO); return new Result(); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java index d60b177815..d9c1b86e9a 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java @@ -45,8 +45,6 @@ public class PersonalCenterServiceImpl implements PersonalCenterService { @Override public void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO) { - formDTO.setUserId(tokenDto.getUserId()); - formDTO.setCustomerId(tokenDto.getCustomerId()); Result result = epmetUserOpenFeignClient.editUserInfo(formDTO); if (!result.success()) { throw new RenException(result.getCode(), result.getMsg()); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index ef54d73a3a..e8eb4249fa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; @@ -17,36 +18,41 @@ import java.io.Serializable; public class EditInfoFormDTO implements Serializable { private static final long serialVersionUID = 1280489016677129419L; + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 头像 */ - @NotBlank(message = "头像不能为空") + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) private String userId; /** * 头像 */ - @NotBlank(message = "头像不能为空") + @NotBlank(message = "头像不能为空",groups = AddUserShowGroup.class) private String headImgUrl; /** * 姓 */ - @NotBlank(message = "姓不能为空") + @NotBlank(message = "姓不能为空",groups = AddUserShowGroup.class) private String surname; /** * 名 */ - @NotBlank(message = "名不能为空") + @NotBlank(message = "名不能为空",groups = AddUserShowGroup.class) private String name; //@NotBlank(message = "身份证号不能为空") - @Length(max=18,message = "身份证号不能超过18位") + @Length(max=18,message = "身份证号不能超过18位",groups = AddUserShowGroup.class) //别的小程序不统一升级，没办法限制必填。 private String idNum; /** * 路牌号 */ - @NotBlank(message = "路牌号不能为空") + @NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class) private String street; /** * 小区名称 @@ -59,12 +65,12 @@ public class EditInfoFormDTO implements Serializable { /** * 昵称 */ - @NotBlank(message = "昵称不能为空") + @NotBlank(message = "昵称不能为空",groups = AddUserShowGroup.class) private String nickname; /** * 当前客户id */ - @NotBlank(message = "customerId不能为空") + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) private String customerId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java index d64368a7b4..c99a96878c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java @@ -57,7 +57,7 @@ public class InfoSubmitFromDTO implements Serializable { private String name; //@NotBlank(message = "身份证号不能为空") - //@Length(max=18,message = "身份证号不能超过18位") + @Length(max=18,message = "身份证号不能超过18位") //别的小程序不统一升级，没办法限制必填。 private String idNum; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 41e4a1114a..820f310a40 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -171,6 +171,7 @@ public class UserResiInfoController { */ @PostMapping("edituserinfo") public Result editUserInfo(@RequestBody EditInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,EditInfoFormDTO.AddUserShowGroup.class,EditInfoFormDTO.AddUserInternalGroup.class); userResiInfoService.editUserInfo(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 456365e58c..35e52df1d8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -192,5 +192,6 @@ public interface UserBaseInfoService extends BaseService { UserBaseInfoDTO getUserIdByIdNum(String customerId, String idNum,String userId); + @Deprecated Integer checkIdNum(String idNum, String customerId, String excludeUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 2d25fc6bde..09a74b157f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -27,7 +27,6 @@ import com.epmet.commons.tools.constant.FieldConstant; 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; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -218,16 +217,17 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl NumConstant.ZERO) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + throw new EpmetException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode(), "user_resi_info已存在该身份证号", EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getMsg()); } //判断user_base_info表是否存在相同的身份证号 if (userBaseInfoService.checkIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(), null) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用"); + throw new EpmetException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode(), "user_base_info已存在该身份证号", EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getMsg()); } - } + }*/ userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 registerRelationService.saveRegisterRelation(userResiInfoDTO); @@ -311,15 +311,16 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + throw new EpmetException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode(), "user_resi_info已存在该身份证号", EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getMsg()); } //判断user_base_info表是否存在相同的身份证号 if (userBaseInfoService.checkIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(), null) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用"); + throw new EpmetException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode(), "user_base_info已存在该身份证号", EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getMsg()); } - } + }*/ //居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 registerRelationService.saveRegisterRelation(userResiInfoDTO); //数据存入居民注册表 @@ -394,19 +395,20 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl18){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号至多18位"); } //判断身份证号唯一，除了当前用户外没有人用过这个身份证号吧？？？ if(baseDao.selectCountByIdNum(formDTO.getIdNum(),formDTO.getCustomerId(),formDTO.getUserId())>0){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + throw new EpmetException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode(), "user_resi_info已存在该身份证号", EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getMsg()); } //判断user_base_info表是否存在相同的身份证号 if (userBaseInfoService.checkIdNum(formDTO.getIdNum(), formDTO.getCustomerId(), formDTO.getUserId()) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用"); + throw new EpmetException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode(), "user_base_info已存在该身份证号", EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getMsg()); } - } + }*/ //更新居民注册信息表 baseDao.updateByUserId(ConvertUtils.sourceToTarget(formDTO, UserResiInfoEntity.class)); //更新baseInfo From e154b2fa1c92131896806098e313d8c9f71ac318 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 11:07:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?/epmetuser/icresiuser/persondata=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E5=A2=9E=E5=8A=A0epmetUserIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/PersonDataResultDTO.java | 2 +- .../com/epmet/dto/result/ResiUserResDTO.java | 9 +++++---- .../java/com/epmet/dao/UserBaseInfoDao.java | 7 ++++--- .../java/com/epmet/dao/UserResiInfoDao.java | 5 ++--- .../com/epmet/service/UserBaseInfoService.java | 2 +- .../service/impl/IcResiUserServiceImpl.java | 2 +- .../service/impl/UserBaseInfoServiceImpl.java | 6 +++--- .../com/epmet/service/impl/UserServiceImpl.java | 17 +++++++++-------- .../main/resources/mapper/UserBaseInfoDao.xml | 9 ++------- .../main/resources/mapper/UserResiInfoDao.xml | 9 ++------- 10 files changed, 30 insertions(+), 38 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java index 3d1334d249..68ad326637 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java +++ b/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 epmetUserIdList; /** * ic_resi_user.id diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java index 3d0679b9d4..250ed45494 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserResDTO.java +++ b/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 String icResiUserId; + private List epmetUserIdList; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java index 7cea610e90..3cd4c5ffe2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java +++ b/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 { **/ String selectIdByUserId(@Param("userId") String userId); - UserBaseInfoDTO selectUserId(@Param("customerId") String customerId, - @Param("idNum")String idNum, - @Param("userId")String userId); + List selectCommonIdNumUser(@Param("customerId") String customerId, + @Param("idNum")String idNum); Integer selectCountIdNum(@Param("idNum") String idNum, @Param("customerId")String customerId, diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 048b6d114b..73044f21c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -106,7 +106,6 @@ public interface UserResiInfoDao extends BaseDao { @Param("customerId") String customerId, @Param("excludeUserId")String excludeUserId); - UserResiInfoDTO selectByIdNum(@Param("customerId") String customerId, - @Param("idNum")String idNum, - @Param("userId")String userId); + List selectCommonIdNumUser(@Param("customerId") String customerId, + @Param("idNum")String idNum); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 35e52df1d8..b5ca38d3ed 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -190,7 +190,7 @@ public interface UserBaseInfoService extends BaseService { **/ ExtUserInfoResultDTO extUserInfo(CommonUserIdFormDTO param); - UserBaseInfoDTO getUserIdByIdNum(String customerId, String idNum,String userId); + List getCommonIdNumUser(String customerId, String idNum); @Deprecated Integer checkIdNum(String idNum, String customerId, String excludeUserId); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ed20fb2374..ea21846183 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -538,7 +538,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl()); personData.setIcResiUserId(formDTO.getUserId()); // 房屋信息查询 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index a8afc76953..5dd7677665 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -444,11 +444,11 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl getCommonIdNumUser(String customerId, String idNum) { + if(StringUtils.isBlank(idNum)){ return null; } - return baseDao.selectUserId(customerId,idNum,userId); + return baseDao.selectCommonIdNumUser(customerId,idNum); } @Override diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 36e820b18d..697fda9582 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/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 implem } ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class); if (StringUtils.isNotBlank(formDTO.getIdNum())) { - UserBaseInfoDTO userBaseInfoDTO = userBaseInfoService.getUserIdByIdNum(formDTO.getCustomerId(), - formDTO.getIdNum(), null); - if (null == userBaseInfoDTO || StringUtils.isBlank(userBaseInfoDTO.getUserId())) { + List userBaseInfoList = userBaseInfoService.getCommonIdNumUser(formDTO.getCustomerId(),formDTO.getIdNum()); + if (CollectionUtils.isEmpty(userBaseInfoList)) { log.info("user_base_info没有找到,去查下user_resi_info表吧"); - UserResiInfoDTO userResiInfoDTO = userResiInfoDao.selectByIdNum(formDTO.getCustomerId(), - formDTO.getIdNum(), null); - resiUserResDTO.setEpmetUserId(null != userResiInfoDTO ? userResiInfoDTO.getId() : StrConstant.EPMETY_STR); + List userResiInfoDTO = userResiInfoDao.selectCommonIdNumUser(formDTO.getCustomerId(),formDTO.getIdNum()); + resiUserResDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(userResiInfoDTO) ? userResiInfoDTO.stream().map(UserResiInfoDTO::getUserId).collect(Collectors.toList()): new ArrayList<>()); } else { - resiUserResDTO.setEpmetUserId(userBaseInfoDTO.getUserId()); + resiUserResDTO.setEpmetUserIdList(userBaseInfoList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList())); } } return resiUserResDTO; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml index 16a0e4d8e9..ae0fbc5486 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml @@ -121,18 +121,13 @@ AND USER_ID = #{userId} - SELECT * FROM user_base_info WHERE DEL_FLAG = '0' AND customer_id = #{customerId} - - and id_num=#{idNum} - - - and user_id=#{userId} - + and id_num=#{idNum} - SELECT uri.* FROM @@ -199,11 +199,6 @@ WHERE uri.DEL_FLAG = '0' and uri.customer_id=#{customerId} - - AND uri.id_num = #{idNum} - - - and uri.user_id=#{userId} - + AND uri.id_num = #{idNum} From d9c81f6af5dfb72db48fcde71b56d88551e5fca1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 8 Dec 2021 11:15:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?"mydemand"=E5=85=A5=E5=8F=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0epmetUserIdList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/demand/IcResiUserDemandFromDTO.java | 7 ++++++- .../service/impl/IcUserDemandRecServiceImpl.java | 6 +++++- .../src/main/resources/mapper/IcUserDemandRecDao.xml | 12 ++++-------- 3 files changed, 15 insertions(+), 10 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 51d334d874..f29e088293 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 @@ -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 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 userIds; } 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 0693b7ec7b..3a0f278b10 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 @@ -475,7 +475,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl userIds=new ArrayList<>(); + userIds.add(formDTO.getUserId()); + if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ + userIds.addAll(formDTO.getEpmetUserIdList()); + } //2、小程序内自己上报+赋能平台待录入的 PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO)); 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 8aed916dee..33d491e2b4 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 @@ -134,14 +134,10 @@ ic_user_demand_rec r WHERE r.DEL_FLAG = '0' - - - AND (r.DEMAND_USER_ID = #{userId} or r.DEMAND_USER_ID=#{epmetUserId}) - - - AND r.DEMAND_USER_ID = #{userId} - - + AND r.DEMAND_USER_ID in + + #{demandUserId} + and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')