diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index 0ebc34c00c..1f1b9848b3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -213,7 +213,9 @@ public class MaskProcessor { } String maskStr = StrUtil.repeatByLength("*", length - 7); - + if (length != 11) { + return StringUtils.leftPad(StringUtils.right(originString, 4), length, "*"); + } return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java index 74c7166a2c..d242b1b526 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java @@ -111,6 +111,21 @@ public class IcPartyMemberDTO implements Serializable { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 是否免学习0否,1是 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java index 5ded6b154c..c31343d3c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java @@ -82,4 +82,8 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable { private String payEndDate; private String year; private String month; + /** + * 是否请长假 + */ + private String isQcj; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java index 1f6a367d80..1133a77bc1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java @@ -98,6 +98,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 是否免学习0否,1是 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java index ac937ae045..eca3bdef44 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java @@ -56,6 +56,15 @@ public class IcPartyMemberImportExcel { @ExcelProperty("文化程度") private String culture; + @ExcelProperty("入党时所在党支部") + private String rdsszzb; + + @ExcelProperty("组织关系转入社区时间") + private String zzgxzrsqsj; + + @ExcelProperty("是否请长假") + private String isQcj; + @ExcelProperty("备注") private String remark; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 9685adfdd6..d9d43ea387 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; -import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.IcFormCodeEnum; import com.epmet.commons.tools.enums.PartyPostEnum; @@ -399,6 +398,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl AND a.IS_MXX = #{isMxx} + + AND a.IS_QCJ = #{isQcj} + AND a.CULTURE = #{culture} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java index 879732a1b4..f771404184 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java @@ -26,6 +26,11 @@ public class ChangeDeathDTO implements Serializable { */ private String id; + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * epmet用户主键 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index 088f8431d5..7db30e392b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java @@ -24,6 +24,16 @@ public class ChangeRelocationDTO implements Serializable { */ private String id; + /** + * ic_resi_user主键 + */ + private String icResiUserId; + + /** + * ic_resi_user 用户状态 + */ + private String status; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java index 46bee9f321..6516b5161c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java @@ -25,6 +25,8 @@ public class IcBirthRecordDTO implements Serializable { */ private String id; + private String icResiUserId; + /** * 客户Id customer.id */ @@ -193,4 +195,4 @@ public class IcBirthRecordDTO implements Serializable { @JsonIgnore private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java new file mode 100644 index 0000000000..0fd1d33d65 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java @@ -0,0 +1,78 @@ +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/5/10 10:02 + */ +@NoArgsConstructor +@Data +public class BirthRecordListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 5077167613040462646L; + /** + * 客户ID + */ + private String customerId; + private String staffId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 网格ID + */ + private String gridId; + /** + * 小区ID + */ + private String villageId; + /** + * 楼栋ID + */ + private String buildId; + /** + * 单元ID + */ + private String unitId; + /** + * 房屋ID + */ + private String homeId; + /** + * 姓名 + */ + private String name; + /** + * 手机 + */ + private String mobile; + /** + * 身份证 + */ + private String idCard; + /** + * 性别 + */ + private String gender; + /** + * 出生日开始 + */ + private String startTime; + /** + * 出生日期结束 + */ + private String endTime; + /** + * 是否福利 + */ + private String isWelfare; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java new file mode 100644 index 0000000000..3e2501850d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + +/** + * @author wgf + * @dscription + */ +@Data +public class OnlyIdFormDTO implements Serializable { + + private static final long serialVersionUID = -5220529162950147825L; + /** + * 主键 + */ + @NotBlank(message = "主键不能为空") + private String id; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java index 9ec9b5956d..d0be989687 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java @@ -18,6 +18,12 @@ public class IcMoveInListResultDTO implements Serializable { * 迁入Id */ private String moveInId; + + /** + * ic_resi_user主键 + */ + private String icResiUserId; + /** * 网格ID */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java index 963d2369d0..92cdab0235 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeDeathExcel; import com.epmet.service.ChangeDeathService; import org.apache.commons.collections4.CollectionUtils; @@ -94,6 +95,20 @@ public class ChangeDeathController { ExcelUtils.exportEpmetExcel(response, null, list, ChangeDeathExcel.class); } + /** + * 恢复死亡人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeDeathService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 1b84302742..6ac14fec7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeRelocationExcel; import com.epmet.service.ChangeRelocationService; import org.apache.commons.collections4.CollectionUtils; @@ -144,4 +145,18 @@ public class ChangeRelocationController { return new Result(); } + /** + * 恢复迁出人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeRelocationService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index 55e6f4cdc2..b9229eea74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -92,6 +93,14 @@ public class IcBirthRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icBirthRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 18c40e286e..b11e6e369c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMoveInRecordDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.IcMoveInAddEditFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; @@ -95,6 +96,14 @@ public class IcMoveInRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icMoveInRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java index f3cfc215ee..1d35ce2c12 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.BirthRecordListFormDTO; import com.epmet.entity.IcBirthRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 出生管理 * @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcBirthRecordDao extends BaseDao { - -} \ No newline at end of file + + List selectListByEntity(BirthRecordListFormDTO birthRecordListFormDTO); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java index 10add799d0..07ca2844b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java @@ -85,6 +85,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity { */ private String isDyzxh; + /** + * 入党时所在党支部 + */ + private String rdsszzb; + + /** + * 组织关系转入社区时间 + */ + private String zzgxzrsqsj; + + /** + * 是否请长假 + */ + private String isQcj; + /** * 预留字段1 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java index 7be06b1436..09af4e2bdc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java @@ -2,8 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; 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.dto.ChangeDeathDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeDeathEntity; import java.util.List; @@ -76,4 +78,12 @@ public interface ChangeDeathService extends BaseService { * @date 2022-05-05 */ void delete(String[] ids); + + /** + * 恢复迁出人员 + * @return + */ + void recovery(TokenDto tokenDto, OnlyIdFormDTO dto); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java index 150fc05fa0..fb87579a59 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java @@ -2,8 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; 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.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeRelocationEntity; import java.util.List; @@ -105,4 +107,12 @@ public interface ChangeRelocationService extends BaseService page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); @@ -201,4 +210,34 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl page(Map params) { @@ -342,6 +352,36 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl wrapper = getWrapper(formDTO, staffInfo); - List entityList = baseDao.selectList(wrapper); - PageInfo pageInfo = new PageInfo<>(entityList); - List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); +// LambdaQueryWrapper wrapper = getWrapper(formDTO, staffInfo); +// List entityList = baseDao.selectList(wrapper); + + BirthRecordListFormDTO birthRecordListFormDTO = ConvertUtils.sourceToTarget(formDTO, BirthRecordListFormDTO.class); + birthRecordListFormDTO.setAgencyId(staffInfo.getAgencyId()); + List list = baseDao.selectListByEntity(birthRecordListFormDTO); + + + PageInfo pageInfo = new PageInfo<>(list); +// List list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class); if (CollectionUtils.isNotEmpty(list)) { //查询网格名称 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 1cbea0526e..ffae249cc1 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 @@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; -import com.epmet.excel.DataSyncRecordDisabilityExcel; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; @@ -343,6 +342,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl partyWrapper = new LambdaQueryWrapper<>(); partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser()); IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper); @@ -2472,7 +2486,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl + - \ No newline at end of file + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml index 87e2d5f12b..03065d2e60 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml @@ -5,74 +5,74 @@ - \ No newline at end of file + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml index 4b7203f075..c5717beea3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml @@ -25,7 +25,7 @@ WHERE del_flag = '0' AND ic_user_id = #{icUserId} - ORDER BY change_time DESC, type ASC + ORDER BY CREATED_TIME DESC, type ASC @@ -81,4 +81,4 @@ where IC_USER_ID = #{icResiUserId} - \ No newline at end of file +