Browse Source

Merge branch 'dev_partymember_sync'

dev
zhaoqifeng 3 years ago
parent
commit
c90ff0d2e3
  1. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java
  2. 15
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java
  3. 4
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java
  4. 15
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberEntity.java
  5. 9
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java
  6. 7
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
  7. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql
  8. BIN
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx
  9. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
  10. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
  11. 10
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
  12. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
  13. 78
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java
  14. 25
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java
  15. 6
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
  16. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeDeathController.java
  17. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
  18. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
  19. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java
  20. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcBirthRecordDao.java
  21. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
  22. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeDeathService.java
  23. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java
  24. 47
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
  25. 40
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
  26. 15
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
  27. 35
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
  28. 13
      epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__edit_partymember.sql
  29. BIN
      epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls
  30. BIN
      epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx
  31. 1
      epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
  32. 4
      epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
  33. 82
      epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
  34. 86
      epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
  35. 4
      epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

4
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());
}

15
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是
*/

4
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;
}

15
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是
*/

9
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;

7
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<IcPartyMemberDao,
if (StringUtils.isBlank(entity.getIsTx())) {
entity.setIsTx(NumConstant.ZERO_STR);
}
if (StringUtils.isBlank(entity.getIsQcj())) {
entity.setIsQcj(NumConstant.ZERO_STR);
}
//判断党员是否已存在,有则更新,没有则添加
if (null != partyMember) {
@ -674,6 +676,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
e.setIsLd(("是").equals(e.getIsLd())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
e.setIsDyzxh(("是").equals(e.getIsDyzxh())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
e.setIsMxx(("是").equals(e.getIsMxx())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
e.setIsQcj(("是").equals(e.getIsQcj())?NumConstant.ONE_STR:NumConstant.ZERO_STR);
//职务
e.setPartyZw(PartyPostEnum.getCode(e.getPartyZw()));
//文化程度
@ -691,7 +694,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
if (result.success() && null != result.getData()) {
e.setIcResiUser(result.getData().getIcResiUser());
e.setVolunteerCategory(result.getData().getVolunteerCategory());
e.setAddress(result.getData().getAddress());
e.setAddress(StringUtils.isNotBlank(result.getData().getAddress())?result.getData().getAddress():e.getAddress());
}
e.setCreatedBy(currentUserId);
e.setUpdatedBy(currentUserId);

10
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql

@ -0,0 +1,10 @@
ALTER TABLE `ic_party_member`
ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`,
ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`,
ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`;
UPDATE ic_party_member
SET IS_QCJ = '0'
WHERE
IS_QCJ IS NULL;

BIN
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/excel/ic_party_member.xlsx

Binary file not shown.

3
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml

@ -106,6 +106,9 @@
<if test='null != isMxx and "" != isMxx.trim()'>
AND a.IS_MXX = #{isMxx}
</if>
<if test='null != isQcj and "" != isQcj.trim()'>
AND a.IS_QCJ = #{isQcj}
</if>
<if test='null != culture and "" != culture.trim()'>
AND a.CULTURE = #{culture}
</if>

5
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用户主键
*/

10
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;
/**
* 姓名
*/

4
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;
}
}

78
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;
}

25
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;
}

6
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
*/

15
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();
}
}

15
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();
}
}

9
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 {

9
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 {

10
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<IcBirthRecordEntity> {
}
List<IcBirthRecordDTO> selectListByEntity(BirthRecordListFormDTO birthRecordListFormDTO);
}

15
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
*/

10
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<ChangeDeathEntity> {
* @date 2022-05-05
*/
void delete(String[] ids);
/**
* 恢复迁出人员
* @return
*/
void recovery(TokenDto tokenDto, OnlyIdFormDTO dto);
}

10
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<ChangeRelocationEnt
* @Date 2022/6/27 10:52
*/
void moveOutHomeConfirm(ChangeRelocationDTO dto);
/**
* 恢复迁出人员
* @return
*/
void recovery(TokenDto tokenDto,OnlyIdFormDTO dto);
}

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

@ -5,8 +5,11 @@ 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.IcResiUserSubStatusEnum;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
@ -17,18 +20,19 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.constant.IcResiUserConstant;
import com.epmet.dao.ChangeDeathDao;
import com.epmet.dao.IcResiUserDao;
import com.epmet.dto.ChangeDeathDTO;
import com.epmet.dto.ChangeWelfareDTO;
import com.epmet.dto.form.IcResiUserTransferFormDTO;
import com.epmet.dto.form.OnlyIdFormDTO;
import com.epmet.dto.form.RentTenantDataFormDTO;
import com.epmet.dto.result.RentTenantDataResultDTO;
import com.epmet.entity.ChangeDeathEntity;
import com.epmet.entity.ChangeRelocationEntity;
import com.epmet.entity.IcResiUserEntity;
import com.epmet.entity.IcUserChangeRecordEntity;
import com.epmet.redis.ChangeDeathRedis;
import com.epmet.service.ChangeDeathService;
import com.epmet.service.ChangeWelfareService;
import com.epmet.service.IcResiUserService;
import com.epmet.service.IcUserTransferRecordService;
import com.epmet.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -65,6 +69,11 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
@Autowired
private ChangeRelocationServiceImpl changeRelocationServiceImpl;
@Autowired
private IcResiUserDao icResiUserDao;
@Autowired
private IcUserChangeRecordService icUserChangeRecordService;
@Override
public PageData<ChangeDeathDTO> page(Map<String, Object> params) {
params.put("customerId", loginUserUtil.getLoginUserCustomerId());
@ -201,4 +210,34 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public void recovery(TokenDto tokenDto, OnlyIdFormDTO dto) {
// 更新用户基础信息用户状态信息
ChangeDeathEntity changeDeathEntity = baseDao.selectById(dto.getId());
IcResiUserEntity icResiUserEntity = icResiUserDao.selectById(changeDeathEntity.getUserId());
icResiUserEntity.setStatus("0");
icResiUserEntity.setSubStatus("52");
icResiUserDao.updateById(icResiUserEntity);
// 添加迁出恢复记录
CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
changeRecordEntity.setOperatorId(tokenDto.getUserId());
changeRecordEntity.setIcUserId(icResiUserEntity.getId());
changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
changeRecordEntity.setIcUserName(icResiUserEntity.getName());
changeRecordEntity.setType("recovery_death");
changeRecordEntity.setTypeName("恢复死亡");
changeRecordEntity.setBeforeChangeName("-");
changeRecordEntity.setAfterChangeName("-");
changeRecordEntity.setChangeTime(new java.util.Date());
icUserChangeRecordService.insert(changeRecordEntity);
// 清除迁出表数据
baseDao.deleteById(dto.getId());
}
}

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

@ -6,12 +6,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
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.IcResiUserSubStatusEnum;
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.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
@ -23,15 +26,18 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.constant.IcResiUserConstant;
import com.epmet.constant.SystemMessageType;
import com.epmet.dao.ChangeRelocationDao;
import com.epmet.dao.IcResiUserDao;
import com.epmet.dto.ChangeRelocationDTO;
import com.epmet.dto.ChangeWelfareDTO;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.form.IcResiUserTransferFormDTO;
import com.epmet.dto.form.OnlyIdFormDTO;
import com.epmet.dto.form.RentTenantDataFormDTO;
import com.epmet.dto.form.SystemMsgFormDTO;
import com.epmet.dto.result.RentTenantDataResultDTO;
import com.epmet.entity.ChangeRelocationEntity;
import com.epmet.entity.IcResiUserEntity;
import com.epmet.entity.IcUserChangeRecordEntity;
import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.redis.ChangeRelocationRedis;
import com.epmet.service.*;
@ -78,6 +84,10 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
private IcUserTransferRecordService icUserTransferRecordService;
@Resource
private IcResiUserConfirmService icResiUserConfirmService;
@Autowired
private IcResiUserDao icResiUserDao;
@Autowired
private IcUserChangeRecordService icUserChangeRecordService;
@Override
public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
@ -342,6 +352,36 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
}
}
@Override
public void recovery(TokenDto tokenDto, OnlyIdFormDTO dto) {
// 更新用户基础信息用户状态信息
ChangeRelocationEntity changeRelocationEntity = baseDao.selectById(dto.getId());
IcResiUserEntity icResiUserEntity = icResiUserDao.selectById(changeRelocationEntity.getIcUserId());
icResiUserEntity.setStatus("0");
icResiUserEntity.setSubStatus("51");
icResiUserDao.updateById(icResiUserEntity);
// 添加迁出恢复记录
CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
changeRecordEntity.setOperatorId(tokenDto.getUserId());
changeRecordEntity.setIcUserId(icResiUserEntity.getId());
changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
changeRecordEntity.setIcUserName(icResiUserEntity.getName());
changeRecordEntity.setType("recovery_moveout");
changeRecordEntity.setTypeName("恢复迁出");
changeRecordEntity.setBeforeChangeName("-");
changeRecordEntity.setAfterChangeName("-");
changeRecordEntity.setChangeTime(new java.util.Date());
icUserChangeRecordService.insert(changeRecordEntity);
// 清除迁出表数据
baseDao.deleteById(dto.getId());
}
public void editResiMq(String customerId, String userId) {
//推送MQ事件
IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();

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

@ -23,6 +23,7 @@ import com.epmet.dao.IcResiUserDao;
import com.epmet.dto.ChangeWelfareDTO;
import com.epmet.dto.IcBirthRecordDTO;
import com.epmet.dto.form.BirthRecordFormDTO;
import com.epmet.dto.form.BirthRecordListFormDTO;
import com.epmet.dto.form.BirthRecordUpdateDTO;
import com.epmet.dto.form.IcResiUserTransferFormDTO;
import com.epmet.dto.result.AllGridsByUserIdResultDTO;
@ -79,10 +80,16 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
}
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
LambdaQueryWrapper<IcBirthRecordEntity> wrapper = getWrapper(formDTO, staffInfo);
List<IcBirthRecordEntity> entityList = baseDao.selectList(wrapper);
PageInfo<IcBirthRecordEntity> pageInfo = new PageInfo<>(entityList);
List<IcBirthRecordDTO> list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class);
// LambdaQueryWrapper<IcBirthRecordEntity> wrapper = getWrapper(formDTO, staffInfo);
// List<IcBirthRecordEntity> entityList = baseDao.selectList(wrapper);
BirthRecordListFormDTO birthRecordListFormDTO = ConvertUtils.sourceToTarget(formDTO, BirthRecordListFormDTO.class);
birthRecordListFormDTO.setAgencyId(staffInfo.getAgencyId());
List<IcBirthRecordDTO> list = baseDao.selectListByEntity(birthRecordListFormDTO);
PageInfo<IcBirthRecordDTO> pageInfo = new PageInfo<>(list);
// List<IcBirthRecordDTO> list = ConvertUtils.sourceToTarget(entityList, IcBirthRecordDTO.class);
if (CollectionUtils.isNotEmpty(list)) {
//查询网格名称

35
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<IcResiUserDao, IcResi
partyMemberDTO.setName(map.get("NAME"));
partyMemberDTO.setIdCard(map.get("ID_CARD"));
partyMemberDTO.setMobile(map.get("MOBILE"));
partyMemberDTO.setCulture(map.get("CULTURE"));
String houseAddress = getHouseAddress4PartymemberInfo(tokenDto.getCustomerId(), map.get("GRID_ID"), map.get("HOME_ID"));
partyMemberDTO.setAddress(houseAddress);
@ -373,6 +373,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
partyMemberDTO.setPartyZw(hash.get("PARTY_ZW"));
partyMemberDTO.setIsTx(hash.get("IS_TX"));
partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH"));
partyMemberDTO.setRdsszzb(hash.get("RDSSZZB"));
partyMemberDTO.setZzgxzrsqsj(hash.get("ZZGXZRSQSJ"));
partyMemberDTO.setIsQcj(hash.get("IS_QCJ"));
}
}
if ("ic_volunteer".equals(d.getTableName())) {
@ -604,6 +607,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
} else {
partyMemberDTO.setMobile(icResiUser.getMobile());
}
if (map.containsKey("CULTURE")) {
partyMemberDTO.setCulture(map.get("CULTURE"));
} else {
partyMemberDTO.setCulture(icResiUser.getCulture());
}
//查询网格信息
String gridId = null;
if (map.containsKey("GRID_ID")) {
@ -703,6 +712,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
partyMemberDTO.setPartyZw(hash.get("PARTY_ZW"));
partyMemberDTO.setIsTx(hash.get("IS_TX"));
partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH"));
partyMemberDTO.setRdsszzb(hash.get("RDSSZZB"));
partyMemberDTO.setZzgxzrsqsj(hash.get("ZZGXZRSQSJ"));
partyMemberDTO.setIsQcj(hash.get("IS_QCJ"));
}
}
if ("ic_volunteer".equals(d.getTableName())) {
@ -2391,6 +2403,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
user.setName(formDTO.getName());
user.setMobile(formDTO.getMobile());
user.setIsParty(NumConstant.ONE_STR);
user.setCulture(formDTO.getCulture());
//如果是党员中心户,则居民是志愿者
if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) {
user.setIsVolunteer(NumConstant.ONE_STR);
@ -2435,6 +2448,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
user.setName(formDTO.getName());
user.setMobile(formDTO.getMobile());
user.setIsParty(NumConstant.ONE_STR);
user.setCulture(formDTO.getCulture());
//如果是党员中心户,则居民是志愿者
if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) {
user.setIsVolunteer(NumConstant.ONE_STR);
@ -2446,13 +2460,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
//判断是否有党员信息,没有则新增一条,有的话就更新
String branch = formDTO.getOrgPids();
if (StringUtils.isNotBlank(branch)) {
branch = branch.replace(StrConstant.COLON, StrConstant.COMMA);
} else {
branch = "";
}
formDTO.setSszb(branch.concat(formDTO.getSszb()));
//String branch = formDTO.getOrgPids();
//if (StringUtils.isNotBlank(branch)) {
// branch = branch.replace(StrConstant.COLON, StrConstant.COMMA);
//} else {
// branch = "";
//}
//formDTO.setSszb(branch.concat(formDTO.getSszb()));
LambdaQueryWrapper<IcPartyMemberEntity> partyWrapper = new LambdaQueryWrapper<>();
partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser());
IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper);
@ -2472,7 +2486,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
if (null != volunteer) {
dto.setVolunteerCategory(volunteer.getVolunteerCategory());
}
CustomerResiUserRedis.delIcResiUserInfo(dto.getIcResiUser());
return dto;
}
@ -2978,6 +2992,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
memberMap.put("LDZH", dto.getLdzh());
memberMap.put("PARTY_ZW", dto.getPartyZw());
memberMap.put("IS_DYZXH", dto.getIsDyzxh());
memberMap.put("RDSSZZB", dto.getRdsszzb());
memberMap.put("ZZGXZRSQSJ", dto.getZzgxzrsqsj());
memberMap.put("IS_QCJ", dto.getIsQcj());
list.add(memberMap);
detail.put("ic_party_member", list);
}

13
epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__edit_partymember.sql

@ -0,0 +1,13 @@
ALTER TABLE `ic_party_member`
ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`,
ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`,
ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`;
alter table ic_user_change_record modify column TYPE varchar(64) NOT NULL COMMENT '操作类型【add:新增 category:类别 transfer:调动;logout注销;recovery_moveout恢复迁出;recovery_death恢复死亡】';
alter table ic_user_change_record modify column TYPE_NAME varchar(64) NOT NULL COMMENT '操作类型名称【add:新增 category:类别 transfer:调动;logout注销;recovery_moveout恢复迁出;recovery_death恢复死亡】';
alter table ic_resi_user modify column SUB_STATUS varchar(10) DEFAULT '01' COMMENT '用户详细状态:01:新增、02:导入、03:迁入、04:新生、11:迁出、21死亡;51迁出恢复;52死亡恢复';
UPDATE ic_party_member
SET IS_QCJ = '0'
WHERE
IS_QCJ IS NULL;

BIN
epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls

Binary file not shown.

BIN
epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx

Binary file not shown.

1
epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml

@ -28,6 +28,7 @@
SELECT
d.id,
u.id AS userId,
u.id as icResiUserId,
d.GRID_ID,
u.`NAME`,
d.ID_CARD,

4
epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml

@ -39,6 +39,7 @@
SELECT
r.id,
u.`NAME`,
u.STATUS,
r.ID_CARD,
u.GENDER,
r.age,
@ -64,7 +65,8 @@
r.CREATED_TIME,
r.UPDATED_TIME,
r.OUT_OF_TIME,
r.IC_USER_ID
r.IC_USER_ID,
r.IC_USER_ID as icResiUserId
FROM
pli_change_relocation r
LEFT JOIN ic_resi_user u ON u.ID_CARD = r.ID_CARD

82
epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml

@ -34,6 +34,86 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<select id="selectListByEntity" parameterType="com.epmet.dto.form.BirthRecordListFormDTO" resultType="com.epmet.dto.IcBirthRecordDTO">
select
iru.ID as icResiUserId,
ibr.ID,
ibr.CUSTOMER_ID,
ibr.AGENCY_ID,
ibr.PIDS,
ibr.GRID_ID,
ibr.VILLAGE_ID,
ibr.BUILD_ID,
ibr.UNIT_ID,
ibr.HOME_ID,
ibr.NAME,
ibr.MOBILE,
ibr.GENDER,
ibr.ID_CARD,
ibr.BIRTHDAY,
ibr.BIRTHPLACE,
ibr.IS_WELFARE,
ibr.FATHER,
ibr.MOTHER,
ibr.COUNT,
ibr.REPORT_DATE,
ibr.HOUSEHOLDER_NAME,
ibr.HOUSEHOLDER_RELATION,
ibr.IS_CHECK,
ibr.DEL_FLAG,
ibr.REVISION,
ibr.CREATED_BY,
ibr.CREATED_TIME,
ibr.UPDATED_BY,
ibr.UPDATED_TIME
from ic_birth_record ibr
left join ic_resi_user iru on iru.ID_CARD = ibr.ID_CARD and iru.DEL_FLAG = 0
where ibr.DEL_FLAG = 0
<if test='customerId != "" and customerId != null'>
AND ibr.CUSTOMER_ID = #{customerId}
</if>
<if test='agencyId != "" and agencyId != null'>
AND (ibr.AGENCY_ID = #{agencyId} or FIND_IN_SET(#{agencyId},ibr.PIDS))
</if>
<if test='gridId != "" and gridId != null'>
AND ibr.GRID_ID = #{gridId}
</if>
<if test='villageId != "" and villageId != null'>
AND ibr.VILLAGE_ID = #{villageId}
</if>
<if test='buildId != "" and buildId != null'>
AND ibr.BUILD_ID = #{buildId}
</if>
<if test='unitId != "" and unitId != null'>
AND ibr.UNIT_ID = #{unitId}
</if>
<if test='homeId != "" and homeId != null'>
AND ibr.HOME_ID = #{homeId}
</if>
<if test='gender != "" and gender != null'>
AND ibr.GENDER = #{gender}
</if>
<if test='isWelfare != "" and isWelfare != null'>
AND ibr.IS_WELFARE = #{isWelfare}
</if>
<if test='name != "" and name != null'>
AND ibr.NAME like concat('%',#{name},'%')
</if>
<if test='mobile != "" and mobile != null'>
AND ibr.MOBILE like concat('%',#{mobile},'%')
</if>
<if test='idCard != "" and idCard != null'>
AND ibr.ID_CARD like concat('%',#{idCard},'%')
</if>
<if test='startTime != "" and startTime != null'>
AND ibr.BIRTHDAY <![CDATA[>=]]> #{startTime}
</if>
<if test='endTime != "" and endTime != null'>
AND ibr.BIRTHDAY <![CDATA[<=]]> #{endTime}
</if>
order by ibr.CREATED_TIME desc
</select>
</mapper>
</mapper>

86
epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml

@ -5,74 +5,74 @@
<select id="selectMoveInList" resultType="com.epmet.dto.result.IcMoveInListResultDTO">
SELECT
id moveInId,
grid_id gridId,
village_id villageId,
build_id buildId,
unit_id unitId,
home_id homeId,
name NAME,
is_welfare isWeifare,
is_check isCheck,
mobile mobile,
id_card idCard,
gender gender,
IF(gender='1','男',IF(gender='2','女','未知'))genderName,
age age,
in_time inTime,
in_reason inReason,
source_address_code sourceAddressCode,
source_address_path_code sourceAddressPathCode,
source_address sourceAddress,
address address,
move_number moveNumber,
householder_name householderName,
householder_relation householderRelation
FROM
ic_move_in_record
WHERE
del_flag = '0'
AND customer_id=#{customerId}
iru.ID as icResiUserId,
mir.id moveInId,
mir.grid_id gridId,
mir.village_id villageId,
mir.build_id buildId,
mir.unit_id unitId,
mir.home_id homeId,
mir.name NAME,
mir.is_welfare isWeifare,
mir.is_check isCheck,
mir.mobile mobile,
mir.id_card idCard,
mir.gender gender,
IF(mir.gender='1','男',IF(mir.gender='2','女','未知'))genderName,
mir.age age,
mir.in_time inTime,
mir.in_reason inReason,
mir.source_address_code sourceAddressCode,
mir.source_address_path_code sourceAddressPathCode,
mir.source_address sourceAddress,
mir.address address,
mir.move_number moveNumber,
mir.householder_name householderName,
mir.householder_relation householderRelation
FROM ic_move_in_record mir
left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0
WHERE mir.del_flag = '0'
AND mir.customer_id=#{customerId}
<if test="gridId != null and gridId != '' ">
AND grid_id = #{gridId}
AND mir.grid_id = #{gridId}
</if>
<if test="villageId != null and villageId != '' ">
AND village_id = #{villageId}
AND mir.village_id = #{villageId}
</if>
<if test="buildId != null and buildId != '' ">
AND build_id = #{buildId}
AND mir.build_id = #{buildId}
</if>
<if test="unitId != null and unitId != '' ">
AND unit_id = #{unitId}
AND mir.unit_id = #{unitId}
</if>
<if test="homeId != null and homeId != '' ">
AND home_id = #{homeId}
AND mir.home_id = #{homeId}
</if>
<if test="name != null and name != '' ">
AND `name` LIKE CONCAT('%', #{name}, '%')
AND mir.name LIKE CONCAT('%', #{name}, '%')
</if>
<if test="mobile != null and mobile != '' ">
AND mobile = #{mobile}
AND mir.mobile = #{mobile}
</if>
<if test="idCard != null and idCard != '' ">
AND id_card = #{idCard}
AND mir.id_card = #{idCard}
</if>
<if test="startTime != null and startTime != '' ">
AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[>=]]> #{startTime}
AND DATE_FORMAT(mir.in_time,"%Y-%m-%d") <![CDATA[>=]]> #{startTime}
</if>
<if test="endTime != null and endTime != '' ">
AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[<=]]> #{endTime}
AND DATE_FORMAT(mir.in_time,"%Y-%m-%d") <![CDATA[<=]]> #{endTime}
</if>
<if test="isWeifare != null and isWeifare != '' ">
AND is_welfare = #{isWeifare}
AND mir.is_welfare = #{isWeifare}
</if>
<if test="moveInId != null and moveInId != '' ">
AND id = #{moveInId}
AND mir.id = #{moveInId}
</if>
<if test="agencyId != null and agencyId != '' ">
AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
AND (mir.AGENCY_ID = #{agencyId} OR mir.PIDS LIKE CONCAT('%',#{agencyId},'%'))
</if>
ORDER BY created_time DESC
ORDER BY mir.created_time DESC
</select>
</mapper>
</mapper>

4
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
</select>
@ -81,4 +81,4 @@
where IC_USER_ID = #{icResiUserId}
</update>
</mapper>
</mapper>

Loading…
Cancel
Save