From 8972a3249db7909310e6934b4be2c276777f3786 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 6 Sep 2022 17:08:00 +0800 Subject: [PATCH 01/22] emm --- .../dto/IcPointNucleicMonitoringDTO.java | 5 ++ .../epmet/dto/result/MapInfoResultDTO.java | 5 ++ .../controller/IcPointAppController.java | 12 +++- .../dao/IcPointNucleicMonitoringDao.java | 8 +++ .../IcPointNucleicMonitoringEntity.java | 8 ++- .../com/epmet/service/IcPointAppService.java | 16 +++--- .../IcPointNucleicMonitoringService.java | 8 +++ .../service/impl/IcPointAppServiceImpl.java | 56 +++++-------------- .../IcPointNucleicMonitoringServiceImpl.java | 17 ++++-- ...ter_ic_point_nucleic_monitoring_enable.sql | 1 + .../mapper/IcPointNucleicMonitoringDao.xml | 10 ++++ 11 files changed, 86 insertions(+), 60 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.68__alter_ic_point_nucleic_monitoring_enable.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java index 3a29fb0afc..08f51a1e5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java @@ -66,6 +66,11 @@ public class IcPointNucleicMonitoringDTO implements Serializable { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java index 896d1195fc..12d9cf0db4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java @@ -77,6 +77,11 @@ public class MapInfoResultDTO implements Serializable { */ private String latitude; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java index b6f3edb0a7..c5c6ca64c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java @@ -43,7 +43,17 @@ public class IcPointAppController { return icPointAppService.getMapInfoByPointType(formDTO); } - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @PostMapping("enableOrDisabled/{id}") + public Result enableOrDisabled(@PathVariable("id") String id){ + icPointAppService.enableOrDisabled(id); + return new Result(); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index eae4085362..908cf46e44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -49,4 +49,12 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getMapInfoList(MapInfoFormDTO formDTO); + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(@Param("id") String id); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java index 4a05b5d850..e9e54456cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 核酸监测点 * @@ -66,6 +63,11 @@ public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java index 6d6f7626d9..f626bc4e01 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java @@ -1,18 +1,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.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.entity.IcPointNucleicMonitoringEntity; -import org.springframework.web.bind.annotation.RequestBody; -import java.io.InputStream; import java.util.List; -import java.util.Map; /** * 地图信息 @@ -29,5 +21,11 @@ public interface IcPointAppService { */ Result> getMapInfoByPointType(MapInfoFormDTO formDTO); - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java index 70d92655a5..3d862dd627 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -105,4 +105,12 @@ public interface IcPointNucleicMonitoringService extends BaseService getMapInfoList(MapInfoFormDTO formDTO); + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java index 7927aea977..16d73ed457 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java @@ -1,58 +1,17 @@ package com.epmet.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerOrgRedis; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constants.ImportTaskConstants; -import com.epmet.dao.IcPointVaccinesInoculationDao; -import com.epmet.dto.IcPointVaccinesInoculationDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcPointVaccinesInoculationEntity; -import com.epmet.excel.IcPointVaccinesInoculationImportExcel; -import com.epmet.excel.error.PointVaccinesInoculationErrorModel; -import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.feign.OssFeignClient; -import com.epmet.redis.IcPointVaccinesInoculationRedis; import com.epmet.service.IcPointAppService; import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcPointVaccinesInoculationService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.commons.CommonsMultipartFile; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; /** * 地图信息 @@ -85,4 +44,15 @@ public class IcPointAppServiceImpl implements IcPointAppService { } return new Result>().ok(mapInfoResultDTO); } + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @Override + public void enableOrDisabled(String id) { + icPointNucleicMonitoringService.enableOrDisabled(id); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index cb2b516b13..df2214249c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -16,7 +16,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,10 +27,8 @@ import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import com.epmet.entity.IcPointNucleicMonitoringEntity; import com.epmet.excel.IcPointNucleicMonitoringImportExcel; -import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel; import com.epmet.excel.error.PointNucleicMonitoringErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; @@ -373,5 +370,17 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl + + + update ic_point_nucleic_monitoring + set UPDATED_TIME = now(), + ENABLE_FLAG = case when ENABLE_FLAG = 'enable' then 'disabled' else 'enable' end + where id = #{id} + + + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java index ff71263f95..7d357089f6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -22,6 +22,14 @@ public class UserChartFormDTO implements Serializable { * 组织、网格、小区类型 agency grid village */ private String orgType; + /** + * 数据类型【居民总数: all 常住: cz 流动: ld】 + */ + private String type; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; //id集合 private List idList; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index a62980703a..c25d1ff604 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1411,4 +1411,15 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(page); } + /** + * @Author sun + * @Description 【人房概览】居民统计数点击查询列表 + **/ + @PostMapping("icuserstatislist") + public Result> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icResiUserService.icUserStatisList(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 1fedc84df4..dd9e97bbae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -428,4 +428,6 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/6/29 17:37 */ List getIcUserCount(IcUserCountFormDTO formDTO); + + List icUserStatisList(UserChartFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 8975e06443..a301d44010 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -507,4 +507,6 @@ public interface IcResiUserService extends BaseService { IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); + + PageData icUserStatisList(UserChartFormDTO formDTO); } 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 2f44c543d5..e565f93b35 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 @@ -3351,4 +3351,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); } + + @Override + public PageData icUserStatisList(UserChartFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //1.判断入参是否有值，没有值则赋值当前工作人员缓存中所属组织信息 + if (StringUtils.isEmpty(formDTO.getOrgId())) { + //2.获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } + //获取无效组织网格Id列表 + if("agency".equals(formDTO.getOrgType())){ + //查询组织数据时排除掉当前组织及下级无效组织列表 + Result result = govOrgOpenFeignClient.getDelAgencyGridIdList(formDTO.getOrgId()); + if (!result.success()) { + throw new EpmetException(String.format("获取当前组织及下级已删除组织、网格列表失败，组织Id->%s", formDTO.getUserId())); + } + formDTO.setAgencyIdList(result.getData().getAgencyIdList()); + formDTO.setGridIdList(result.getData().getGridIdList()); + } + + //2.按条件查询业务数据 + List list = baseDao.icUserStatisList(formDTO); + if (CollectionUtils.isEmpty(list)) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + + //3.封装数据 + //查询小区，楼号，网格 + Result> gridResult = govOrgOpenFeignClient.getGridListByGridIds(list.stream().map(SearchByNameResultDTO::getGridId).collect(Collectors.toList())); + if (!gridResult.success()) { + throw new RenException(gridResult.getCode(), gridResult.getMsg()); + } + Map gridMap = gridResult.getData().stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName)); + Result> neighborHoodResult = govOrgOpenFeignClient.getListByIds(list.stream().map(SearchByNameResultDTO::getNeighborHoodId).collect(Collectors.toList())); + if (!neighborHoodResult.success()) { + throw new RenException(neighborHoodResult.getCode(), neighborHoodResult.getMsg()); + } + Map neighborHoodMap = neighborHoodResult.getData().stream().collect(Collectors.toMap(IcNeighborHoodDTO::getId, IcNeighborHoodDTO::getNeighborHoodName)); + Result> buildResult = govOrgOpenFeignClient.buildingListByIds(list.stream().map(SearchByNameResultDTO::getBuildId).collect(Collectors.toList())); + if (!buildResult.success()) { + throw new RenException(buildResult.getCode(), buildResult.getMsg()); + } + Map buildMap = buildResult.getData().stream().collect(Collectors.toMap(BuildingResultDTO::getBuildingId, BuildingResultDTO::getBuildingName)); + AtomicInteger i = new AtomicInteger(NumConstant.ONE); + list.forEach(item -> { + item.setGridName(gridMap.get(item.getGridId())); + item.setNeighborHoodName(neighborHoodMap.get(item.getNeighborHoodId())); + item.setBuildNum(buildMap.get(item.getBuildId())); + item.setSort(i.getAndIncrement()); + }); + + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + } 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 9373743976..a32b2741a6 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 @@ -1289,4 +1289,52 @@ + + + From faa1a9ed502974eafb6d06112eefa8b77b8feb2c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 7 Sep 2022 15:09:24 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/IcPartyOrgDTO.java | 10 ++++++ .../partyOrg/form/EditPrincipalFormDTO.java | 33 +++++++++++++++++++ .../partyOrg/result/IcPartyOrgTreeDTO.java | 10 ++++++ .../controller/IcPartyOrgController.java | 14 ++++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 9 +++++ .../partyOrg/entity/IcPartyOrgEntity.java | 10 ++++++ .../partyOrg/service/IcPartyOrgService.java | 10 ++++++ .../service/impl/IcPartyOrgServiceImpl.java | 13 ++++++++ .../db/migration/V0.0.10__add_principal.sql | 2 ++ .../mapper/partyOrg/IcPartyOrgDao.xml | 26 ++++++++++++--- 10 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java index b5d26e1ee6..3273372fed 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java @@ -84,6 +84,16 @@ public class IcPartyOrgDTO implements Serializable { */ private String address; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + /** * 党组织介绍 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java new file mode 100644 index 0000000000..e7cab3e965 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/9/7 15:02 + * @DESC + */ +@Data +public class EditPrincipalFormDTO implements Serializable { + + private static final long serialVersionUID = -1006713792388125512L; + + /** + * 负责人 + */ + @NotBlank(message = "principal不能为空",groups = AddGroup.class) + private String principal; + + @NotBlank(message = "partyOrgId不能为空",groups = AddGroup.class) + private String partyOrgId; + + /** + * 联系电话 + */ + @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) + private String principalMobile; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java index cb5bf1b927..7888f71899 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java @@ -53,6 +53,16 @@ public class IcPartyOrgTreeDTO implements Serializable { */ private String partyOrgName; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + private List children = new ArrayList<>(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 60c3327978..2279fd3ca2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; @@ -189,4 +190,17 @@ public class IcPartyOrgController { return new Result>().ok(icPartyOrgService.partOrgList(formDTO.getGridId())); } + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + @PostMapping("editPrincipal") + public Result editPrincipal(@RequestBody EditPrincipalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + icPartyOrgService.editPrincipal(formDTO); + return new Result(); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index fe4d17c517..88fe00f0ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; @@ -117,4 +118,12 @@ public interface IcPartyOrgDao extends BaseDao { List getSelfAndSub(@Param("joinOrgId") String joinOrgId); List partOrgList(@Param("agencyId") String agencyId); + + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + void editPrincipal(EditPrincipalFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java index e9ea2f210c..b6404fb481 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java @@ -73,6 +73,16 @@ public class IcPartyOrgEntity extends BaseEpmetEntity { */ private String address; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + /** * 党组织介绍 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 22485b8171..aa13fbfec8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.*; @@ -148,4 +149,13 @@ public interface IcPartyOrgService extends BaseService { void adjustOrgPath(List customerIds); List partOrgList(String gridId); + + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + void editPrincipal(EditPrincipalFormDTO formDTO); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 3405183f47..8862404285 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.*; @@ -490,4 +491,16 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl + + + + update ic_party_org + set PRINCIPAL_MOBILE = #{principalMobile}, + PRINCIPAL = #{principal}, + UPDATED_TIME = NOW() + where id = #{partyOrgId} + + + From 304fd62c86037e75ab9202dac8810dc30c3e1079 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 8 Sep 2022 10:46:38 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E4=BA=BA=E9=98=B2=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E4=B8=8B=E9=92=BB=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcHouseDao.xml | 2 +- .../src/main/resources/mapper/IcResiUserDao.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 8b443733ea..5cfdd0fd4d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -629,7 +629,7 @@ ) - GROUP BY + ORDER BY a.sort, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), 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 a32b2741a6..3732fbfd5d 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 @@ -1313,6 +1313,12 @@ del_flag = '0' AND status = '0' AND customer_id = #{customerId} + + AND is_floating = '0' + + + AND (is_floating != '0' or is_floating is null) + AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%')) @@ -1334,7 +1340,7 @@ AND village_id = #{orgId} - GROUP BY `name` ASC + ORDER BY `name` ASC From eadc1c9bff0a09be64e0b96857656c1d5c1df159 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 13:32:12 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 957b687fa5..c235a5826a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -1076,7 +1076,7 @@ SELECT CUSTOMER_USER_ID,RESI_GROUP_ID FROM resi_group_member WHERE DEL_FLAG = '0' AND GROUP_LEADER_FLAG = 'leader' - AND `STATUS` = 'approved' + AND RESI_GROUP_ID IN ( #{id} From 6ab99298d737d827bd0c3e080d7b2f6bfdb1d5c5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:38:13 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcResiCategoryStatsConfigFormDTO.java | 9 ++++++++- .../result/IcResiCategoryStatsConfigResultDTO.java | 14 +++++++++++++- .../entity/IcResiCategoryStatsConfigEntity.java | 8 ++++++++ .../mapper/IcResiCategoryStatsConfigDao.xml | 5 ++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java index 7d10474443..c5af9dc2c1 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java @@ -74,5 +74,12 @@ public class IcResiCategoryStatsConfigFormDTO implements Serializable { private Integer level2; private Integer level3; - + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java index e161b60f6d..45ee8f8ce3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java @@ -44,7 +44,10 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable { */ private String label; - + /** + * 列名 + */ + private String columnName; /** * 管理平台分类图标 @@ -84,4 +87,13 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable { * 等级3阈值 */ private Integer level3; + + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java index d0201db93d..4a292260b9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java @@ -80,4 +80,12 @@ public class IcResiCategoryStatsConfigEntity extends BaseEpmetEntity { */ private Integer sort; + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index f138b59d0d..366690ed03 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -26,6 +26,7 @@ select a.ID as id, a.LABEL as label, + a.COLUMN_NAME as columnName, a.MANAGEMENT_ICON as managementIcon, a.DATA_ICON as dataIcon, a.HOUSE_SHOW_ICON as houseShowIcon, @@ -34,7 +35,9 @@ b.LEVEL_1 as level1, b.LEVEL_2 as level2, b.LEVEL_3 as level3, - b.WARN + b.WARN, + a.AUTO_MATCHING as , + a.YLFN_VALUE as from ic_resi_category_stats_config a left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} From bd5706aa6ca7c8b24b37b5d637a7cb04366f3389 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:45:27 +0800 Subject: [PATCH 12/22] =?UTF-8?q?ic=5Fresi=5Fcategory=5Fstats=5Fconfig?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.38__ylfnv.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql new file mode 100644 index 0000000000..4ff1496be2 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql @@ -0,0 +1,4 @@ +alter table ic_resi_category_stats_config + add COLUMN `AUTO_MATCHING` varchar(1) NOT NULL DEFAULT '0' COMMENT '自动匹配：开启1；不匹配：0' after SORT; + +alter table ic_resi_category_stats_config add COLUMN `YLFN_VALUE` varchar(32) DEFAULT NULL COMMENT '育龄妇女年龄范围，英文逗号隔开的数字例如：18,49' after AUTO_MATCHING; \ No newline at end of file From ecc2d44161973ff85d88c8e7bd3ec907907ebc8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:46:36 +0800 Subject: [PATCH 13/22] buig --- .../main/resources/mapper/IcResiCategoryStatsConfigDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index 366690ed03..49ec2d3bbd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -36,8 +36,8 @@ b.LEVEL_2 as level2, b.LEVEL_3 as level3, b.WARN, - a.AUTO_MATCHING as , - a.YLFN_VALUE as + a.AUTO_MATCHING as autoMatching, + a.YLFN_VALUE as ylfnValue from ic_resi_category_stats_config a left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} From 5bd15bb4bb89fb3cb99d1a61483bd2d61b2f9675 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 8 Sep 2022 16:04:26 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=A2=9E=E5=8A=A0=E5=B9=B4=E9=BE=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/IdCardRegexUtils.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index 96d7d02a62..ff1f0b0549 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -1,10 +1,15 @@ package com.epmet.commons.tools.utils; import com.epmet.commons.tools.enums.IdCardTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.Period; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -50,6 +55,7 @@ public class IdCardRegexUtils { private String birthdayMonth; private String birthdayDay; private String sex; + private Integer age; } /** @@ -116,7 +122,17 @@ public class IdCardRegexUtils { String month = matcher.group("month"); String day = matcher.group("day"); String sex = matcher.group("sex"); - return new ParsedContent(year, month, day, sex); + + // ------- 年龄Start---------- + Integer age; + try { + LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + age = Period.between(birthday, LocalDate.now()).getYears(); + } catch (DateTimeException e) { + throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e)); + } + // ------- 年龄End---------- + return new ParsedContent(year, month, day, sex, age); } // 其他类型暂时不可解析 @@ -130,4 +146,10 @@ public class IdCardRegexUtils { public IdCardTypeEnum getTypeEnum() { return idCardType; } + + public static void main(String[] args) { + IdCardRegexUtils parse = IdCardRegexUtils.parse("370282198801303017"); + ParsedContent parsedResult = parse.getParsedResult(); + System.out.println(parsedResult); + } } From c14fd6416194b04ca3d1344015b1c38cc7c10203 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 8 Sep 2022 17:29:27 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/task/ic/IcUpdateYlfnTask.java | 35 +++++ .../epmet/dto/result/YlfnValueResultDTO.java | 18 +++ .../feign/OperCustomizeOpenFeignClient.java | 3 +- .../OperCustomizeOpenFeignClientFallback.java | 5 + .../IcResiCategoryStatsConfigController.java | 6 + .../IcResiCategoryStatsConfigService.java | 11 ++ .../IcResiCategoryStatsConfigServiceImpl.java | 32 +++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/IcResiUserController.java | 13 ++ .../com/epmet/service/IcResiUserService.java | 9 ++ .../service/impl/IcResiUserServiceImpl.java | 122 +++++++++++++++++- 12 files changed, 257 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java new file mode 100644 index 0000000000..b7a1ffb6ea --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java @@ -0,0 +1,35 @@ +package com.epmet.task.ic; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.task.ITask; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * desc:定时弥补数据 保证数据的一致性 + */ +@Slf4j +@Component("icUpdateYlfnTask") +public class IcUpdateYlfnTask implements ITask { + + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + /** + * 执行定时任务接口 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + Result result = epmetUserOpenFeignClient.updateYlfn(); + if (result.success()) { + log.info("icUpdateYlfnTask定时任务正在执行定时任务执行成功"); + } else { + log.warn("icUpdateYlfnTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java new file mode 100644 index 0000000000..9056944c83 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/9/8 15:43 + */ +@Data +public class YlfnValueResultDTO implements Serializable { + private static final long serialVersionUID = -1416102274320519092L; + private String customerId; + private Integer min; + private Integer max; +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index e93d9badaa..ce2063c361 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -178,5 +178,6 @@ public interface OperCustomizeOpenFeignClient { */ @PostMapping("/oper/customize/icformitemoptions/getItemConditions") Result> getOptionsMap(@RequestBody IcFormOptionsQueryFormDTO input); - + @PostMapping("/oper/customize/icresicategorystatsconfig/getYlfnValue") + Result> getYlfnValue(); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index e59af2b818..70debfecf3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -142,4 +142,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getOptionsMap", input); } + @Override + public Result> getYlfnValue() { + return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getYlfnValue", null); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java index 775001770f..e8dbf8b1af 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java @@ -26,6 +26,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.IcResiCategoryStatsConfigDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.excel.IcResiCategoryStatsConfigExcel; import com.epmet.service.IcResiCategoryStatsConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -96,4 +97,9 @@ public class IcResiCategoryStatsConfigController { return new Result>().ok(icResiCategoryStatsConfigService.getCategoryList(dto)); } + @PostMapping("getYlfnValue") + public Result> getYlfnValue() { + return new Result>().ok(icResiCategoryStatsConfigService.getYlfnValue()); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java index f9092491aa..6f151130dd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import java.util.List; @@ -111,4 +112,14 @@ public interface IcResiCategoryStatsConfigService extends BaseService getCustomerCategoryShowAndWarnList(String customerId); + /** + * 获取育龄妇女配置 + * + * @Param + * @Return {@link List< YlfnValueResultDTO>} + * @Author zhaoqifeng + * @Date 2022/9/8 15:50 + */ + List getYlfnValue(); + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java index d5bfdbd521..bc6758ec21 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java @@ -22,11 +22,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.constant.StrConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcResiCategoryStatsConfigDao; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import com.epmet.redis.IcResiCategoryStatsConfigRedis; import com.epmet.service.IcResiCategoryStatsConfigService; @@ -37,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * 居民类别配置表 @@ -137,4 +141,32 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl(); } + /** + * 获取育龄妇女配置 + * + * @Param + * @Return {@link List< YlfnValueResultDTO >} + * @Author zhaoqifeng + * @Date 2022/9/8 15:50 + */ + @Override + public List getYlfnValue() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiCategoryStatsConfigEntity::getAutoMatching, NumConstant.ONE_STR); + wrapper.eq(IcResiCategoryStatsConfigEntity::getColumnName, "IS_YLFN"); + wrapper.isNotNull(IcResiCategoryStatsConfigEntity::getYlfnValue); + List list = baseDao.selectList(wrapper); + if(CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + YlfnValueResultDTO dto = new YlfnValueResultDTO(); + dto.setCustomerId(item.getCustomerId()); + String[] ages = item.getYlfnValue().split(StrConstant.COMMA); + dto.setMin(Integer.valueOf(ages[0])); + dto.setMax(Integer.valueOf(ages[1])); + return dto; + }).collect(Collectors.toList()); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 47a67e5fbd..73d770a411 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -882,4 +882,7 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icresiuser/nonDynamic/listResi") Result> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input); + + @PostMapping("/epmetuser/icresiuser/updateYlfn") + Result updateYlfn(); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 7c9cc3b2a4..2de7371623 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -678,4 +678,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input); } + + @Override + public Result updateYlfn() { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateYlfn", null); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index a62980703a..0d5652074c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1411,4 +1411,17 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(page); } + /** + * 更新育龄妇女状态定时任务 + * @Param + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/9/8 17:19 + */ + @PostMapping("updateYlfn") + public Result updateYlfn() { + icResiUserService.updateYlfn(); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 8975e06443..145ea7fc9e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -507,4 +507,13 @@ public interface IcResiUserService extends BaseService { IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); + + /** + * 更新育龄妇女状态定时任务 + * @Param + * @Return + * @Author zhaoqifeng + * @Date 2022/9/8 15:45 + */ + void updateYlfn(); } 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 2f44c543d5..3c146c3f31 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 @@ -53,10 +53,7 @@ import com.epmet.commons.tools.utils.*; import com.epmet.constant.IcPlatformConstant; import com.epmet.constant.IcResiUserConstant; import com.epmet.constant.UserConstant; -import com.epmet.dao.IcPartyMemberDao; -import com.epmet.dao.IcResiUserDao; -import com.epmet.dao.IcVolunteerDao; -import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; @@ -160,6 +157,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); } + + /** + * 更新育龄妇女状态定时任务 + * + * @Param + * @Return + * @Author zhaoqifeng + * @Date 2022/9/8 15:45 + */ + @Override + public void updateYlfn() { + //获取育龄妇女配置 + Result> value = operCustomizeOpenFeignClient.getYlfnValue(); + if(!value.success()) { + throw new EpmetException(value.getCode(), value.getMsg()); + } + value.getData().forEach(item -> { + //查询客户下的非育龄妇女的女性居民 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getCustomerId, item.getCustomerId()); + wrapper.eq(IcResiUserEntity::getGender, NumConstant.TWO_STR); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); + wrapper.eq(IcResiUserEntity::getIdCardType, NumConstant.ONE_STR); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(user -> { + IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard()); + if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { + if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) { + //将不是育龄妇女的变为育龄妇女 + if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) { + //更新育龄妇女状态 + IcResiUserEntity icResiUserEntity = new IcResiUserEntity(); + icResiUserEntity.setId(user.getId()); + icResiUserEntity.setIsYlfn(NumConstant.ONE_STR); + baseDao.updateById(icResiUserEntity); + + //添加居民变更记录 + IcUserChangeRecordEntity record = new IcUserChangeRecordEntity(); + record.setCustomerId(user.getCustomerId()); + record.setOperatorId("APP_USER"); + record.setOperatorName("系统"); + record.setIcUserId(user.getId()); + record.setIcUserName(user.getName()); + record.setType("category"); + record.setTypeName("类别"); + record.setBeforeChangeName("否"); + record.setAfterChangeName("是"); + record.setChangeTime(new Date()); + icUserChangeRecordDao.insert(record); + //添加变更明细 + IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity(); + detail.setCustomerId(user.getCustomerId()); + detail.setIcUserChangeRecordId(record.getId()); + detail.setPids(user.getPids()); + detail.setAgencyId(user.getAgencyId()); + detail.setGridId(user.getGridId()); + detail.setNeighborHoodId(user.getVillageId()); + detail.setBuildingId(user.getBuildId()); + detail.setBuildingUnitId(user.getUnitId()); + detail.setHouseId(user.getHomeId()); + detail.setIcUserId(user.getId()); + detail.setType("category"); + detail.setTypeName("类别"); + detail.setFieldName("IS_YLFN"); + detail.setValue(NumConstant.ONE); + icUserChangeDetailedDao.insert(detail); + } + } else { + //将是育龄妇女的变为非育龄妇女 + if (pares.getParsedResult().getAge() < item.getMin() || pares.getParsedResult().getAge() > item.getMax()) { + //更新育龄妇女状态 + IcResiUserEntity icResiUserEntity = new IcResiUserEntity(); + icResiUserEntity.setId(user.getId()); + icResiUserEntity.setIsYlfn(NumConstant.ZERO_STR); + baseDao.updateById(icResiUserEntity); + //添加居民变更记录 + IcUserChangeRecordEntity record = new IcUserChangeRecordEntity(); + record.setCustomerId(user.getCustomerId()); + record.setOperatorId("APP_USER"); + record.setOperatorName("系统"); + record.setIcUserId(user.getId()); + record.setIcUserName(user.getName()); + record.setType("category"); + record.setTypeName("类别"); + record.setBeforeChangeName("是"); + record.setAfterChangeName("否"); + record.setChangeTime(new Date()); + icUserChangeRecordDao.insert(record); + //添加变更明细 + IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity(); + detail.setCustomerId(user.getCustomerId()); + detail.setIcUserChangeRecordId(record.getId()); + detail.setPids(user.getPids()); + detail.setAgencyId(user.getAgencyId()); + detail.setGridId(user.getGridId()); + detail.setNeighborHoodId(user.getVillageId()); + detail.setBuildingId(user.getBuildId()); + detail.setBuildingUnitId(user.getUnitId()); + detail.setHouseId(user.getHomeId()); + detail.setIcUserId(user.getId()); + detail.setType("category"); + detail.setTypeName("类别"); + detail.setFieldName("IS_YLFN"); + detail.setValue(NumConstant.ONE_NEG); + icUserChangeDetailedDao.insert(detail); + } + } + } + }); + } + }); + } } From 038b8c47ca8f4fc143d83c7b76c6436697cae0e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 9 Sep 2022 09:18:57 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E4=BA=8E=E7=A9=BA?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java index bc6758ec21..a00f800733 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java @@ -155,6 +155,7 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); From 06cc5e8ac40c6a17b62903bd36f502908cacd003 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 9 Sep 2022 09:35:13 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3c146c3f31..648d315953 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 @@ -3362,6 +3362,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> value = operCustomizeOpenFeignClient.getYlfnValue(); @@ -3374,12 +3375,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(list)) { list.forEach(user -> { IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard()); - if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { + if (null != pares && NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) { //将不是育龄妇女的变为育龄妇女 if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) { From 4b06c587f7d0ceec965ff627628d4c34a4bc42b1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 9 Sep 2022 11:18:35 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 648d315953..ab854a3fd3 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 @@ -3393,13 +3393,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 9 Sep 2022 13:44:28 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java | 5 +++++ .../partymember/dto/partyOrg/form/EditPrincipalFormDTO.java | 3 +++ .../com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java | 5 +++++ .../db/migration/V0.0.10__add_principal_staff_id.sql | 3 +++ .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 1 + 5 files changed, 17 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java index 3273372fed..a6ee2e449e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java @@ -89,6 +89,11 @@ public class IcPartyOrgDTO implements Serializable { */ private String principal; + /** + * 负责人staffId + */ + private String principalStaffId; + /** * 联系电话 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java index e7cab3e965..c518b0ef7e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -30,4 +30,7 @@ public class EditPrincipalFormDTO implements Serializable { */ @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) private String principalMobile; + + @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) + private String principalStaffId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java index b6404fb481..bc8be3d038 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java @@ -78,6 +78,11 @@ public class IcPartyOrgEntity extends BaseEpmetEntity { */ private String principal; + /** + * 负责人staffId + */ + private String principalStaffId; + /** * 联系电话 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql new file mode 100644 index 0000000000..6530fb1923 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql @@ -0,0 +1,3 @@ +ALTER TABLE ic_party_org ADD COLUMN PRINCIPAL_STAFF_ID VARCHAR(32) DEFAULT '' COMMENT '负责人staffId' AFTER PRINCIPAL_MOBILE; +alter table ic_party_org modify PRINCIPAL_MOBILE VARCHAR(30) DEFAULT '' COMMENT '联系方式'; +alter table ic_party_org modify PRINCIPAL VARCHAR(30) DEFAULT '' COMMENT '负责人'; \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 5c042f9487..410a074121 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -30,6 +30,7 @@ update ic_party_org set PRINCIPAL_MOBILE = #{principalMobile}, PRINCIPAL = #{principal}, + PRINCIPAL_STAFF_ID = #{principalStaffId}, UPDATED_TIME = NOW() where id = #{partyOrgId} From aef7cfe939032fba8aebc66fe4025ea9bac48c3a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:06:44 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...principal_staff_id.sql => V0.0.11__add_principal_staff_id.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/{V0.0.10__add_principal_staff_id.sql => V0.0.11__add_principal_staff_id.sql} (100%) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.11__add_principal_staff_id.sql similarity index 100% rename from epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql rename to epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.11__add_principal_staff_id.sql From 9924db162a31e3f051cce0e3fb09d7c98e7641dc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:31:38 +0800 Subject: [PATCH 21/22] emm --- .../src/main/java/com/epmet/dto/result/PersonDataResultDTO.java | 2 ++ .../src/main/resources/mapper/IcResiUserDao.xml | 2 ++ 2 files changed, 4 insertions(+) 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 68ad326637..5e739016b3 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 @@ -47,6 +47,8 @@ public class PersonDataResultDTO implements Serializable { * 姓名 */ private String name; + private String mobile; + private String isTenant; /** * 经济状况:包括 月收入：monthlyIncome 和 退休金额：retirementAmount 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 9373743976..b7a36c0456 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 @@ -310,6 +310,8 @@ YSR, TXJE, ID_CARD, + MOBILE, + IS_TENANT, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, GRID_ID From 11a362654f02ca9773a941d6197cfdfe60ba6f27 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:45:51 +0800 Subject: [PATCH 22/22] emm --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b7a36c0456..7cb24ea51e 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 @@ -296,6 +296,8 @@ + + @@ -311,7 +313,7 @@ TXJE, ID_CARD, MOBILE, - IS_TENANT, + IS_TENANT as isTenant, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, GRID_ID