From 3216ed01d758d1ad7b85dc1e5ad3091929156562 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Jun 2022 09:21:15 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98?= =?UTF-8?q?=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/ConfirmListFormDTO.java | 38 +++++++ .../epmet/dto/form/MoveOutMemberFormDTO.java | 1 + .../dto/result/ConfirmListResultDTO.java | 26 +++++ .../dto/result/MoveOutDetailResultDTO.java | 40 +++++++ .../epmet/controller/MyHomeController.java | 77 ++++++------- .../com/epmet/dao/IcResiUserConfirmDao.java | 23 ++++ .../java/com/epmet/enums/UserConfirmEnum.java | 54 +++++++++ .../service/IcResiUserConfirmService.java | 33 ++++++ .../impl/IcResiUserConfirmServiceImpl.java | 104 ++++++++++++++++++ .../resources/mapper/IcResiUserConfirmDao.xml | 77 +++++++++++++ 10 files changed, 436 insertions(+), 37 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ConfirmListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/enums/UserConfirmEnum.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ConfirmListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ConfirmListFormDTO.java new file mode 100644 index 0000000000..b322086c91 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ConfirmListFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/22 14:16 + */ +@NoArgsConstructor +@Data +public class ConfirmListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -3784221830789219648L; + private String customerId; + private String agencyId; + private String staffId; + private String name; + private String mobile; + private String idCard; + /** + * 迁出类型 + */ + private String submitType; + /** + * 审核状态 + */ + private String confirmResult; + private String gridId; + private String villageId; + private String buildId; + private String unitId; + private String homeId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java index 18bc3cc7c8..1daf911949 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java @@ -133,4 +133,5 @@ public class MoveOutMemberFormDTO implements Serializable { * 与户主关系 */ private String yhzgx; + private String moveOutDate; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java new file mode 100644 index 0000000000..f9c131d7b5 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/22 14:27 + */ +@NoArgsConstructor +@Data +public class ConfirmListResultDTO { + private String id; + private String name; + private String gender; + private String mobile; + private String idCard; + private String gridId; + private String gridName; + private String homeId; + private String homeName; + private String submitType; + private String newHomeName; + private String confirmResult; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java new file mode 100644 index 0000000000..56e68755d3 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/22 16:15 + */ +@NoArgsConstructor +@Data +public class MoveOutDetailResultDTO implements Serializable { + private static final long serialVersionUID = -8151267925780583596L; + private String id; + private String icResiUserId; + private String name; + private String mobile; + private String idCard; + private String gridId; + private String gridName; + private String villageName; + private String buildName; + private String unitName; + private String homeId; + private String homeName; + private String outType; + private String newGridName; + private String newHomeName; + private String moveOutDate; + private String deleteReason; + private String confirmResult; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createdTime; + private String reason; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java index 0e595cc96f..ecc4ec901c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java @@ -3,18 +3,18 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.enums.HomeMemberOperationEnum; +import com.epmet.commons.tools.page.PageData; 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.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcResiUserConfirmDTO; -import com.epmet.dto.form.IcResiUserConfirmGetDTO; -import com.epmet.dto.form.IcResiUserConfirmSubmitDTO; -import com.epmet.dto.form.MoveOutMemberFormDTO; -import com.epmet.dto.form.RegisterAndBindFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.ConfirmListResultDTO; import com.epmet.dto.result.HomeInfoResultDTO; import com.epmet.dto.result.HomeUserBriefResultDTO; +import com.epmet.dto.result.MoveOutDetailResultDTO; import com.epmet.service.IcResiUserConfirmService; import com.epmet.service.IcResiUserService; import com.epmet.service.MyHomeService; @@ -50,38 +50,6 @@ public class MyHomeController { return new Result().ok(myHomeService.selectListHomeMember(houseCode, tokenDto.getCustomerId())); } - -// /** -// * @describe: 新增家庭成员 -// * @author wangtong -// * @date 2022/6/1 15:50 -// * @params [dto] -// * @return com.epmet.commons.tools.utils.Result -// */ -// @PostMapping("addMember") -// public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto){ -// //效验数据 -// ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); -// dto.setSubmitType(HomeMemberOperationEnum.ADD.getCode()); -// return icResiUserConfirmService.addMember(dto); -// } -// -// /** -// * @describe: 修改家庭成员 -// * @author wangtong -// * @date 2022/6/1 15:27 -// * @params [dto] -// * @return com.epmet.commons.tools.utils.Result -// */ -// @PostMapping("editMember") -// public Result save(@RequestBody IcResiUserConfirmSubmitDTO dto){ -// //效验数据 -// ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); -// dto.setSubmitType(HomeMemberOperationEnum.UPDATE.getCode()); -// return icResiUserConfirmService.editMember(dto); -// } -// - /** * @return com.epmet.commons.tools.utils.Result * @describe: 删除家庭成员 @@ -188,11 +156,46 @@ public class MyHomeController { * @author LZN * @date 2022/6/10 11:06 */ - @PostMapping("/moveOutMember") + @PostMapping("moveOutMember") public Result moveOutMember(@RequestBody MoveOutMemberFormDTO form, @LoginUser TokenDto tokenDto) { form.setCustomerId(tokenDto.getCustomerId()); icResiUserConfirmService.moveOutMember(form); return new Result(); } + /** + * 迁出审核列表 + * + * @Param tokenDto + * @Param form + * @Return {@link Result< PageData< ConfirmListResultDTO>>} + * @Author zhaoqifeng + * @Date 2022/6/22 16:13 + */ + @PostMapping("confirmList") + public Result> confirmList(@LoginUser TokenDto tokenDto, @RequestBody ConfirmListFormDTO form) { + form.setCustomerId(tokenDto.getCustomerId()); + form.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icResiUserConfirmService.confirmList(form)); + } + + @PostMapping("moveOutConfirmDetail") + public Result moveOutConfirmDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserConfirmDTO formDTO) { + return new Result().ok(icResiUserConfirmService.moveOutConfirmDetail(tokenDto.getCustomerId(), formDTO.getId())); + } + + /** + * 迁出审核 + * + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/6/22 16:46 + */ + @PostMapping("moveOutConfirm") + public Result moveOutConfirm( @RequestBody IcResiUserConfirmDTO formDTO) { + icResiUserConfirmService.moveOutConfirm(formDTO); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java index 03704abd4b..e7bcf3b528 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java @@ -1,10 +1,15 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.ConfirmListFormDTO; +import com.epmet.dto.result.ConfirmListResultDTO; +import com.epmet.dto.result.MoveOutDetailResultDTO; import com.epmet.entity.IcResiUserConfirmEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 居民信息审核表 * @@ -48,4 +53,22 @@ public interface IcResiUserConfirmDao extends BaseDao { */ void deleteByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId, @Param("submitType") String submitType); + + /** + * 迁出审核列表 + * @Param form + * @Return {@link List< ConfirmListResultDTO>} + * @Author zhaoqifeng + * @Date 2022/6/22 16:28 + */ + List getConfirmList(ConfirmListFormDTO form); + + /** + * 迁出审核详情 + * @Param id + * @Return {@link MoveOutDetailResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/22 16:27 + */ + MoveOutDetailResultDTO getMoveOutConfirmDetail(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/UserConfirmEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/UserConfirmEnum.java new file mode 100644 index 0000000000..91da0ae6c8 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/UserConfirmEnum.java @@ -0,0 +1,54 @@ +package com.epmet.enums; + +import java.util.Objects; + +/** + * @author Administrator + */ + +public enum UserConfirmEnum { + //审核状态 + AUDITING("0", "未审核"), + PASSED("1", "已通过"), + REJECT("2", "未通过"), + ADD("add", "新增"), + UPDATE("update", "修改"), + OUT("out", "迁至客户外"), + IN("in", "迁至客户内"), + ; + + private String code; + private String name; + + + UserConfirmEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static String getName(String code) { + UserConfirmEnum[] userConfirmEnums = values(); + for (UserConfirmEnum userConfirmEnum : userConfirmEnums) { + if (Objects.equals(userConfirmEnum.getCode(), code)) { + return userConfirmEnum.getName(); + } + } + return null; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java index 202964eca1..43852169db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java @@ -4,9 +4,12 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcResiUserConfirmDTO; +import com.epmet.dto.form.ConfirmListFormDTO; import com.epmet.dto.form.IcResiUserConfirmGetDTO; import com.epmet.dto.form.IcResiUserConfirmSubmitDTO; import com.epmet.dto.form.MoveOutMemberFormDTO; +import com.epmet.dto.result.ConfirmListResultDTO; +import com.epmet.dto.result.MoveOutDetailResultDTO; import com.epmet.entity.IcResiUserConfirmEntity; import java.util.List; @@ -135,4 +138,34 @@ public interface IcResiUserConfirmService extends BaseService} + * @Author zhaoqifeng + * @Date 2022/6/22 14:30 + */ + PageData confirmList(ConfirmListFormDTO form); + + /** + * 迁出审核详情 + * + * @Param id + * @Return {@link MoveOutDetailResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/22 16:21 + */ + MoveOutDetailResultDTO moveOutConfirmDetail(String customerId, String id); + + /** + * 迁出审核 + * + * @Param formDTO + * @Return {@link null} + * @Author zhaoqifeng + * @Date 2022/6/22 16:45 + */ + void moveOutConfirm(IcResiUserConfirmDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java index 33888e282f..bb3fa9ab2c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java @@ -5,19 +5,36 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.GenderEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiUserConfirmDao; import com.epmet.dao.IcResiUserDao; import com.epmet.dto.IcResiUserConfirmDTO; +import com.epmet.dto.form.ConfirmListFormDTO; import com.epmet.dto.form.IcResiUserConfirmGetDTO; import com.epmet.dto.form.IcResiUserConfirmSubmitDTO; import com.epmet.dto.form.MoveOutMemberFormDTO; +import com.epmet.dto.result.ConfirmListResultDTO; +import com.epmet.dto.result.MoveOutDetailResultDTO; import com.epmet.entity.IcResiUserConfirmEntity; import com.epmet.entity.IcResiUserEntity; +import com.epmet.enums.UserConfirmEnum; import com.epmet.redis.IcResiUserConfirmRedis; import com.epmet.service.IcResiUserConfirmService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +50,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-01 */ +@Slf4j @Service public class IcResiUserConfirmServiceImpl extends BaseServiceImpl implements IcResiUserConfirmService { @@ -199,4 +217,90 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2022/6/22 14:30 + */ + @Override + public PageData confirmList(ConfirmListFormDTO form) { + //获取工作人员所属组织 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(form.getCustomerId(), form.getStaffId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } + form.setAgencyId(staffInfo.getAgencyId()); + PageHelper.startPage(form.getPageNo(), form.getPageSize()); + List list =baseDao.getConfirmList(form); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + //获取网格信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); + if (null != gridInfo) { + log.warn("迁出审核列表获取网格缓存失败"); + item.setGridName(gridInfo.getGridNamePath()); + } + //获取房屋信息 + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), item.getHomeId()); + if (null != houseInfo) { + log.warn("迁出审核列表获取房屋缓存失败"); + item.setHomeName(houseInfo.getAllName()); + } + item.setGender(GenderEnum.getName(item.getGender())); + item.setConfirmResult(UserConfirmEnum.getName(item.getConfirmResult())); + }); + } + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 迁出审核详情 + * + * @param id + * @Param id + * @Return {@link MoveOutDetailResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/22 16:21 + */ + @Override + public MoveOutDetailResultDTO moveOutConfirmDetail(String customerId, String id) { + MoveOutDetailResultDTO result = baseDao.getMoveOutConfirmDetail(id); + if (null != result) { + //获取网格信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId()); + //获取房屋信息 + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, result.getHomeId()); + if (null == houseInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败"); + } + result.setGridName(houseInfo.getGridName()); + result.setVillageName(houseInfo.getNeighborHoodName()); + result.setBuildName(houseInfo.getBuildingName()); + result.setUnitName(houseInfo.getUnitName()); + result.setHomeName(houseInfo.getDoorName()); + } + + return result; + } + + /** + * 迁出审核 + * + * @param formDTO + * @Param formDTO + * @Return {@link null} + * @Author zhaoqifeng + * @Date 2022/6/22 16:45 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void moveOutConfirm(IcResiUserConfirmDTO formDTO) { + baseDao.updateById(ConvertUtils.sourceToTarget(formDTO, IcResiUserConfirmEntity.class)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml index 30c3baca88..dbb62f62cf 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml @@ -59,6 +59,83 @@ AND CONFIRM_RESULT = '0' AND SUBMIT_TYPE = #{submitType} + + From 96074ccbe18e576f31564bf673b5e35d7d1d2522 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Jun 2022 09:48:20 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98?= =?UTF-8?q?=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcResiUserConfirmDTO.java | 4 ++++ .../impl/IcResiUserConfirmServiceImpl.java | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java index 39ee709284..db8f88ff7e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java @@ -187,4 +187,8 @@ public class IcResiUserConfirmDTO implements Serializable { */ private String operationDescribe; + /** + * 迁出申请状态 0未审核 1已通过 2未通过 3没有迁出申请 + */ + private String moveOutStatus; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java index bb3fa9ab2c..08ccc28774 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -159,8 +160,20 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl getMemberDetail(IcResiUserConfirmGetDTO dto) { IcResiUserConfirmDTO result = icResiUserDao.selectMemberDetail(dto.getIcResiUserId()); - if (null != result && StringUtils.isBlank(result.getGender())) { - result.setGender(""); + if (null != result) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserConfirmEntity::getIcResiUserId, dto.getIcResiUserId()); + wrapper.in(IcResiUserConfirmEntity::getSubmitType, Arrays.asList("in", "out")); + wrapper.orderByDesc(IcResiUserConfirmEntity::getCreatedTime); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(list)) { + result.setMoveOutStatus(list.get(NumConstant.ZERO).getConfirmResult()); + } else { + result.setMoveOutStatus(NumConstant.THREE_STR); + } + if(StringUtils.isBlank(result.getGender())) { + result.setGender(""); + } } return new Result().ok(result); } From d2e5a35d27c2c98f2dd38555c65e557c2bc4eaf8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Jun 2022 10:20:58 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98?= =?UTF-8?q?=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/MyHomeController.java | 2 ++ .../impl/IcResiUserConfirmServiceImpl.java | 19 ++++++++++++++----- .../main/resources/mapper/IcResiUserDao.xml | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java index ecc4ec901c..a3187c62cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.enums.HomeMemberOperationEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -156,6 +157,7 @@ public class MyHomeController { * @author LZN * @date 2022/6/10 11:06 */ + @NoRepeatSubmit @PostMapping("moveOutMember") public Result moveOutMember(@RequestBody MoveOutMemberFormDTO form, @LoginUser TokenDto tokenDto) { form.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java index 08ccc28774..85208ff826 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java @@ -220,12 +220,21 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl 0) { - icResiUserConfirmDao.deleteByIdCard(form.getIdCard(), form.getCustomerId(), form.getSubmitType()); + MoveOutMemberFormDTO userInfo = icResiUserDao.moveOutMember(form.getIcResiUserId(), form.getCustomerId()); + if (null == userInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民已迁出", "居民已迁出"); } + form.setName(userInfo.getAllName()); + form.setAgencyId(userInfo.getAgencyId()); + form.setPids(userInfo.getPids()); + form.setHouseId(userInfo.getHouseId()); + form.setGender(userInfo.getGender()); + form.setIdCard(userInfo.getIdCard()); + form.setBirthday(userInfo.getBirthday()); + form.setHjszd(userInfo.getHjszd()); + form.setXjzd(userInfo.getXjzd()); + form.setMz(userInfo.getMz()); + form.setYhzgx(userInfo.getYhzgx()); IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(form, IcResiUserConfirmEntity.class); icResiUserConfirmDao.insert(entity); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index edb2455bee..57f23f9898 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1108,7 +1108,7 @@ SELECT AGENCY_ID, PIDS, - HOME_ID, + HOME_ID AS houseId, NAME as allName, MOBILE, GENDER, @@ -1123,6 +1123,7 @@ WHERE id = #{icResiUserId} AND customer_id = #{customerId} + AND STATUS = '0' AND DEL_FLAG = '0'