From 553b06353726616c5033613c78d3c6218acf1554 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 22 Jun 2022 11:10:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=BD=91=E6=A0=BC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/BindHomeFormDTO.java | 29 +++ epmet-user/epmet-user-server/pom.xml | 6 + .../controller/IcResiUserController.java | 8 + .../java/com/epmet/dao/IcResiUserDao.java | 5 + .../com/epmet/service/IcResiUserService.java | 2 + .../service/impl/IcResiUserServiceImpl.java | 234 +++++++++++------- .../main/resources/mapper/IcResiUserDao.xml | 25 ++ 7 files changed, 222 insertions(+), 87 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java new file mode 100644 index 0000000000..767dcf1231 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class BindHomeFormDTO implements Serializable { + + private static final long serialVersionUID = -6084569462551209768L; + + /** + * 身份证号 + */ + @NotBlank(message = "身份证号不能为空") + private String idCard; + + /** + * 房屋id + */ + @NotBlank(message = "房屋id不能为空") + private String homeId; + + /** + * 用户id + */ + private String customerId; +} diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c6032cdfce..09fc58c7c1 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -140,6 +140,12 @@ common-service-client 2.0.0 + + com.epmet + open-data-worker-client + 2.0.0 + compile + 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 284d4f691c..e305d6656c 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 @@ -1147,4 +1147,12 @@ public class IcResiUserController implements ResultDataResolver { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(icResiUserService.getUserByIdCard(formDTO)); } + + @PostMapping("/bindHome") + public Result bindHome(@RequestBody BindHomeFormDTO form){ + ValidatorUtils.validateEntity(form); + form.setCustomerId("45687aa479955f9d06204d415238f7cc"); + icResiUserService.bindHome(form); + return new Result(); + } } 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 1a0d5c82d1..b6fb26c637 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 @@ -328,4 +328,9 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/5/19 10:40 */ List getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId); + + int selectCountByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + + + void updateByIdCard(@Param("entity") IcResiUserEntity entity); } 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 561ddf9e2b..4073b75252 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 @@ -374,4 +374,6 @@ public interface IcResiUserService extends BaseService { * @Date 2022/5/20 9:59 */ IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO); + + void bindHome(BindHomeFormDTO form); } 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 665653b1d8..b1b947d080 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 @@ -58,6 +58,10 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.entity.*; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; +import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; +import com.epmet.opendata.feign.GuardarDatosFeignClient; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.github.pagehelper.Page; @@ -137,6 +141,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl NumConstant.ZERO ) { + if (str.length() > NumConstant.ZERO) { String errorMsg = String.format("新增居民信息,必要字段值为空,%s值为空", str); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } @@ -202,7 +208,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO(); - Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); + Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); boolean isDyzxh = false; //判断是否是党员中心户 if (formMap.containsKey("ic_party_member")) { @@ -307,13 +313,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : d.getList()) { - partyMemberDTO.setRdsj(hash.get("RDSJ")); - partyMemberDTO.setSszb(hash.get("SSZB")); - partyMemberDTO.setIsLd(hash.get("IS_LD")); - partyMemberDTO.setLdzh(hash.get("LDZH")); - partyMemberDTO.setPartyZw(hash.get("PARTY_ZW")); - partyMemberDTO.setIsTx(hash.get("IS_TX")); - partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH")); + partyMemberDTO.setRdsj(hash.get("RDSJ")); + partyMemberDTO.setSszb(hash.get("SSZB")); + partyMemberDTO.setIsLd(hash.get("IS_LD")); + partyMemberDTO.setLdzh(hash.get("LDZH")); + partyMemberDTO.setPartyZw(hash.get("PARTY_ZW")); + partyMemberDTO.setIsTx(hash.get("IS_TX")); + partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH")); } } if ("ic_volunteer".equals(d.getTableName())) { @@ -330,7 +336,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO(); - Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); + Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); boolean isDyzxh = false; //判断是否是党员中心户 if (formMap.containsKey("ic_party_member")) { @@ -465,7 +471,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl finalSubTables =new ArrayList<>(); + List finalSubTables = new ArrayList<>(); //groupBy用到的表 - Set groupByTables=new HashSet<>(); - subTables.forEach(subTable->{ - if(tables.contains(subTable.getTableName())){ + Set groupByTables = new HashSet<>(); + subTables.forEach(subTable -> { + if (tables.contains(subTable.getTableName())) { finalSubTables.add(subTable.getJoinTableSql()); - if(subTable.getSupportAdd()){ + if (subTable.getSupportAdd()) { groupByTables.add(subTable.getTableName()); } } }); - PageInfo> pageInfo=new PageInfo<>(); - if (null == formDTO.getIsPage()||formDTO.getIsPage()) { + PageInfo> pageInfo = new PageInfo<>(); + if (null == formDTO.getIsPage() || formDTO.getIsPage()) { //分页 String finalStaffOrgPath = staffOrgPath; pageInfo = PageHelper.startPage(formDTO.getPageNo(), @@ -760,19 +766,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> list=baseDao.selectListResiMap(formDTO.getCustomerId(), + } else { + List> list = baseDao.selectListResiMap(formDTO.getCustomerId(), formDTO.getFormCode(), formDTO.getConditions(), resultColumns, finalSubTables, staffInfoCacheResult.getAgencyId(), - staffOrgPath,null, + staffOrgPath, null, formDTO.getKeyword(), groupByTables); - pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size()); + pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size()); pageInfo.setList(list); } @@ -869,8 +875,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl nameList=new HashSet<>(); - for(String codePath:demandCodePath){ + Set nameList = new HashSet<>(); + for (String codePath : demandCodePath) { if (StringUtils.isNotBlank(codePath) && codePath.contains(StrConstant.COMMA)) { String[] codeAtt = codePath.split(StrConstant.COMMA); String code = codeAtt[codeAtt.length - 1]; @@ -932,51 +938,52 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dynamicQuery(String customerId, - String formCode, - String resultTableName, - List conditions, - String currentStaffAgencyId, - String staffOrgPath){ + public List> dynamicQuery(String customerId, + String formCode, + String resultTableName, + List conditions, + String currentStaffAgencyId, + String staffOrgPath) { // List finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions); - Map> map=getFinalSubables(customerId, formCode, resultTableName, conditions, null); - return baseDao.dynamicQuery(customerId,resultTableName,conditions,map.get("finalSubTables"), null, currentStaffAgencyId,staffOrgPath,map.get("groupByTables")); + Map> map = getFinalSubables(customerId, formCode, resultTableName, conditions, null); + return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); } @NotNull - public Map> getFinalSubables(String customerId, String formCode, String resultTableName, List conditions, List exportNeedTableList) { - Map> map=new HashMap<>(); - CustomerFormQueryDTO queryDTO=new CustomerFormQueryDTO(); + public Map> getFinalSubables(String customerId, String formCode, String resultTableName, List conditions, List exportNeedTableList) { + Map> map = new HashMap<>(); + CustomerFormQueryDTO queryDTO = new CustomerFormQueryDTO(); queryDTO.setCustomerId(customerId); queryDTO.setFormCode(formCode); //所有的子表 - Result> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO); + Result> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO); - List subTables =subTablesRes.getData(); + List subTables = subTablesRes.getData(); // log.info("1、所有的子表subTables:"+JSON.toJSONString(subTables,true)); //关联哪些子表：查询条件用到的表名+查询的列对应的表 并集去重 Set tables = conditions.stream().map(ResiUserQueryValueDTO::getTableName).collect(Collectors.toSet()); tables.add(resultTableName); - if (CollectionUtils.isNotEmpty(exportNeedTableList)){ + if (CollectionUtils.isNotEmpty(exportNeedTableList)) { tables.addAll(exportNeedTableList); } // log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true)); //最终关联的子表对应的sql： - List finalSubTables =new ArrayList<>(); + List finalSubTables = new ArrayList<>(); //groupBy用到的表 - Set groupByTables=new HashSet<>(); - subTables.forEach(subTable->{ - if(tables.contains(subTable.getTableName())){ + Set groupByTables = new HashSet<>(); + subTables.forEach(subTable -> { + if (tables.contains(subTable.getTableName())) { finalSubTables.add(subTable.getJoinTableSql()); - if(subTable.getSupportAdd()){ + if (subTable.getSupportAdd()) { groupByTables.add(subTable.getTableName()); } } }); - map.put("finalSubTables",finalSubTables); + map.put("finalSubTables", finalSubTables); map.put("groupByTables", new ArrayList<>(groupByTables)); return map; } + /** * @param formDTO * @Description 查询个人数据 @@ -1064,6 +1071,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl result = pageInfo.getList(); if (CollectionUtils.isEmpty(result)) { return new PageData<>(new ArrayList<>(), pageInfo.getTotal()); @@ -1538,13 +1546,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl homeIds = list.stream().filter(m -> StringUtils.isNotBlank(m.getIdCard())).map(m -> m.getHomeId()).distinct().collect(Collectors.toSet()); - if (CollectionUtils.isNotEmpty(homeIds)){ + if (CollectionUtils.isNotEmpty(homeIds)) { Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId()); - if (!houseInfoRes.success()){ + if (!houseInfoRes.success()) { throw new EpmetException("查询居民所属房屋失败..."); } - if (CollectionUtils.isNotEmpty(houseInfoRes.getData())){ - list.forEach(l -> houseInfoRes.getData().stream().filter( h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName()))); + if (CollectionUtils.isNotEmpty(houseInfoRes.getData())) { + list.forEach(l -> houseInfoRes.getData().stream().filter(h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName()))); } } PageInfo pageInfo = new PageInfo<>(list); @@ -1731,7 +1739,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } List list = baseDao.getPartyMemberAgeList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); - return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); + return new PageData<>(list, null == list ? NumConstant.ZERO : list.size()); } /** @@ -1806,7 +1814,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, null == list?NumConstant.ZERO:list.size()); + return new PageData<>(list, null == list ? NumConstant.ZERO : list.size()); } @@ -1969,7 +1977,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(IcResiUserEntity::getCustomerId, customerId) .eq(IcResiUserEntity::getHomeId, homeId) - .eq(IcResiUserEntity::getYhzgx,RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) .select( IcResiUserEntity::getId, IcResiUserEntity::getName @@ -2020,17 +2028,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getResiUserGroupHomeId(RentTenantDataFormDTO formDTO) { //如果是组织 且非顶级组织 则利用pids 查询 本级及下级 - if (StringUtils.isNotBlank(formDTO.getAgencyId())){ + if (StringUtils.isNotBlank(formDTO.getAgencyId())) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); - if (agencyInfo == null){ - log.warn("getResiUserGroupHomeId agencyId:{} is not exist",formDTO.getAgencyId()); + if (agencyInfo == null) { + log.warn("getResiUserGroupHomeId agencyId:{} is not exist", formDTO.getAgencyId()); return null; } if (!NumConstant.ZERO_STR.equals(agencyInfo.getPid())) { @@ -2040,35 +2044,35 @@ public class IcResiUserServiceImpl extends BaseServiceImpl listPage = PageHelper - .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) - .doSelectPage(()->baseDao.getResiUserGroupHomeId(formDTO)); + .startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPage(() -> baseDao.getResiUserGroupHomeId(formDTO)); List dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode()); - Map> dictResult = new HashMap<>(); - dictTypeList.forEach(dict->{ + Map> dictResult = new HashMap<>(); + dictTypeList.forEach(dict -> { Result> mapResult = epmetAdminOpenFeignClient.dictMap(dict); - if (mapResult!=null && mapResult.success()){ - dictResult.put(dict,mapResult.getData()); + if (mapResult != null && mapResult.success()) { + dictResult.put(dict, mapResult.getData()); } }); //婚姻状况 - Map hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK"); + Map hyzkMap = getOptionMap(formDTO.getCustomerId(), "HYZK"); //遍历数据 转换为中文 - listPage.getResult().forEach(e->{ - e.getHouseMemberList().parallelStream().forEach(o->{ - if (StringUtils.isNotBlank(o.getIsParty())){ - o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty())?StrConstant.NO:StrConstant.YES); + listPage.getResult().forEach(e -> { + e.getHouseMemberList().parallelStream().forEach(o -> { + if (StringUtils.isNotBlank(o.getIsParty())) { + o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty()) ? StrConstant.NO : StrConstant.YES); } - if (StringUtils.isNotBlank(o.getGender())){ + if (StringUtils.isNotBlank(o.getGender())) { o.setGender(GenderEnum.getName(o.getGender())); } - if (StringUtils.isNotBlank(o.getIsTenant())){ - o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant())?StrConstant.NO:StrConstant.YES); + if (StringUtils.isNotBlank(o.getIsTenant())) { + o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant()) ? StrConstant.NO : StrConstant.YES); } - if (StringUtils.isNotBlank(o.getIsFloating())){ - o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating())?StrConstant.NO:StrConstant.YES); + if (StringUtils.isNotBlank(o.getIsFloating())) { + o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating()) ? StrConstant.NO : StrConstant.YES); } Map mzMap = dictResult.get(DictTypeEnum.NATION.getCode()); Map whcdMap = dictResult.get(DictTypeEnum.EDUCATION.getCode()); @@ -2094,8 +2098,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl changeIcResiUserBelongTo(TokenDto tokenDto, IcUserBelongToChangedFormDTO formDTO) { - List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(),formDTO.getSourceGridId()); - if (CollectionUtils.isEmpty(resiUserIdList)){ + List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); + if (CollectionUtils.isEmpty(resiUserIdList)) { return null; } List icResiUserFormDTOS = new ArrayList<>(); @@ -2109,9 +2113,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl{ + resiUserIdList.forEach(userId -> { map.put(FieldConstant.ID, userId); - this.edit(tokenDto,icResiUserFormDTOS); + this.edit(tokenDto, icResiUserFormDTOS); }); return resiUserIdList; @@ -2134,7 +2138,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl result = feignClient.getResidentDetailByIdCard(dto); + ResidentByIdCardResultDTO residentDetailByIdCard = result.getData(); + if (org.springframework.util.StringUtils.isEmpty(residentDetailByIdCard)) { + throw new RenException("获取不到人的信息"); + } + // 根据房屋id获取房屋信息 + if (StringUtils.isBlank(form.getHomeId())) { + throw new RenException("房屋id不能为空"); + } + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), form.getHomeId()); + if (org.springframework.util.StringUtils.isEmpty(houseInfo)) { + throw new RenException("获取不到房屋信息"); + } + // 将人的信息放入ic_resi_user对象中 + IcResiUserEntity entity = new IcResiUserEntity(); + entity.setCustomerId(form.getCustomerId()); + if (StringUtils.isBlank(residentDetailByIdCard.getIdCard()) + && StringUtils.isBlank(residentDetailByIdCard.getResidentName()) + && StringUtils.isBlank(residentDetailByIdCard.getTelephone()) + && StringUtils.isBlank(residentDetailByIdCard.getBirthday().toString())) { + entity.setIdCard(residentDetailByIdCard.getIdCard()); + entity.setName(residentDetailByIdCard.getResidentName()); + entity.setMobile(residentDetailByIdCard.getTelephone()); + entity.setBirthday(residentDetailByIdCard.getBirthday().toString()); + } else { + throw new RenException("人信息不全"); + } + // 将房屋的信息放入ic_resi_user对象中 + if (StringUtils.isBlank(houseInfo.getHomeId()) + && StringUtils.isBlank(houseInfo.getNeighborHoodId()) + && StringUtils.isBlank(houseInfo.getBuildingId()) + && StringUtils.isBlank(houseInfo.getBuildingUnitId())) { + entity.setHomeId(houseInfo.getHomeId()); + entity.setVillageId(houseInfo.getNeighborHoodId()); + entity.setBuildId(houseInfo.getBuildingId()); + entity.setUnitId(houseInfo.getBuildingUnitId()); + } else { + throw new RenException("房屋信息不全"); + } + if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) { + baseDao.updateByIdCard(entity); + } else { + baseDao.insert(entity); + } + + } + /** * desc:根据字段值获取 options + * * @param customerId * @param columnName * @return */ - private Map getOptionMap(String customerId,String columnName) { + private Map getOptionMap(String customerId, String columnName) { IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); optionsForm.setCustomerId(customerId); optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); optionsForm.setColumnName(columnName); Result> listResult = operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm); - if (!listResult.success()){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取item失败,"+listResult.getInternalMsg()); + if (!listResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取item失败," + listResult.getInternalMsg()); } return listResult.getData().stream() .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1)); 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 13de5c56e1..02be1b1054 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 @@ -211,6 +211,21 @@ update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId} + + update + ic_resi_user + set + name = #{entity.name}, + mobile = #{entity.mobile}, + birthday = #{entity.birthday}, + home_id = #{entity.homeId}, + village_id = #{entity.villageId}, + build_id = #{entity.buildId}, + unit_id = #{entity.unitId} + where + id_card = #{entity.idCard} + AND customer_id = #{entity.customerId} + +