diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 563c5cac04..78e67f817c 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.StatsFormDTO; import com.epmet.feign.DataStatisticalOpenFeignClient; import com.epmet.service.StatsProjectService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,7 +26,9 @@ public class StatsProjectServiceImpl implements StatsProjectService { @Override public Result agencyProjectStats(String params) { StatsFormDTO formDTO = new StatsFormDTO(); - formDTO.setDate(params); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, StatsFormDTO.class); + } return dataStatisticalOpenFeignClient.agencyProjectStats(formDTO); } @@ -35,7 +39,9 @@ public class StatsProjectServiceImpl implements StatsProjectService { @Override public Result gridProjectStats(String params) { StatsFormDTO formDTO = new StatsFormDTO(); - formDTO.setDate(params); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, StatsFormDTO.class); + } return dataStatisticalOpenFeignClient.gridProjectStats(formDTO); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 7635ad0ea7..35abf9d798 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -176,17 +176,18 @@ public interface IcHouseDao extends BaseDao { /** * desc:更新房屋的屋内居民数 及更新时间 不更新 更新人以及 resiNumber没有变化的 记录 * - * @param houseId, + * @param houseId, * @param resiNumber * @return */ int updateIcHouseResiNumber(String houseId, Integer resiNumber); + /** - * @describe: 通过可编辑的编码查询 - * @author wangtong - * @date 2022/6/29 15:24 - * @params [coding] - * @return com.epmet.entity.IcHouseEntity - */ + * @return com.epmet.entity.IcHouseEntity + * @describe: 通过可编辑的编码查询 + * @author wangtong + * @date 2022/6/29 15:24 + * @params [coding] + */ IcHouseEntity selectByCoding(@Param("coding") String coding); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 2d8f0610f2..96e993c865 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -132,7 +132,6 @@ public class IcHouseEntity extends BaseEpmetEntity { * 居住人数 */ private Integer resiNumber; - /** * 房屋可编辑编码 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 546dbc05c7..c89d9eb8c4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -571,6 +571,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override public HouseInfoDTO getHouseInfoDTO(String customerId, String houseId) { HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(houseId, customerId); + if (null == houseInfo) { + return houseInfo; + } if (null != houseInfo && StringUtils.isNotBlank(houseInfo.getAgencyId())) { AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(houseInfo.getAgencyId()); houseInfo.setAgencyPathName(StringUtils.isNotBlank(agencyInfoCache.getAllParentName()) ? agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()) : agencyInfoCache.getOrganizationName()); 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 b399fd4971..b290378551 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 @@ -523,6 +523,7 @@ #{id} ) + UPDATE ic_house SET RESI_NUMBER = #{resiNumber}, UPDATED_TIME = NOW() where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0' diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml index a850719121..d3d5c34a56 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml @@ -57,6 +57,8 @@ INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.CUSTOMER_ID = #{customerId} WHERE g.ID = #{guideId} + and g.DEL_FLAG = '0' + and gc.DEL_FLAG = '0' - \ No newline at end of file + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java index 6867827cd4..a059d76680 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java @@ -22,7 +22,7 @@ public class CancelAttentionPackageFormDTO implements Serializable { /** * 身份证 */ - @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class) +// @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class) private List idCards; /** @@ -30,4 +30,7 @@ public class CancelAttentionPackageFormDTO implements Serializable { */ @NotNull(message = "attentionType不能为空",groups = CancelAttentionPackageForm.class) private Integer attentionType ; + + @NotNull(message = "ids不能为空",groups = CancelAttentionPackageForm.class) + private List ids; } 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 1feccb5fac..0cde5e57af 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 @@ -48,6 +48,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.OrgInfoConstant; import com.epmet.constant.SystemMessageType; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcResiUserDTO; @@ -666,6 +667,8 @@ public class IcResiUserController implements ResultDataResolver { public Result> searchByName(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); + //前端不会传level，这里默认查询当前组织及下级 + formDTO.setLevel(OrgInfoConstant.AGENCY); ValidatorUtils.validateEntity(formDTO, SearchByNameFormDTO.SearchByNameForm.class); return new Result>().ok(icResiUserService.searchByName(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java index 5496919f3c..31ef9ec667 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java @@ -44,13 +44,6 @@ public interface IcNatDao extends BaseDao { **/ int delById(@Param("icNatId") String icNatId); - /** - * 插入或者更新 - * - * @param e - */ - void insertOrUpdate(IcNatEntity e); - /** * @Author sun * @Description 按条件查询业务数据 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 0471d9496b..15cd0fe88e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -46,13 +46,6 @@ public interface IcVaccineDao extends BaseDao { **/ int delById(@Param("icNatId") String icNatId); - /** - * 插入或者更新 - * - * @param e - */ - void insertOrUpdate(IcVaccineEntity e); - /** * @Author sun * @Description 按条件查询业务数据 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 8f348ba5e2..97cb5345a5 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 @@ -489,4 +489,5 @@ public interface IcResiUserService extends BaseService { * @Date 2022/6/29 17:32 */ Map getIcUserCount(IcUserCountFormDTO formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 6175e742c5..5c36cb1eb2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -289,8 +289,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl formItemList, String excelPathName, IcResiUserTableEnum sheetTableEnum, String currUserAgencyId, String currUserAgencyPids, String currentUserId, - String customerId) { + String customerId) { IcResiImportDynamicExcelListener readListener = new IcResiImportDynamicExcelListener(this, customerId, currentUserId, currUserAgencyId, currUserAgencyPids, true, formItemList, sheetTableEnum); @@ -448,8 +456,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @param checkBoxOptionColumnIdxAndLabel 复选框的列号&label中文 */ public void persistIcResiBaseInfo(Map itemIdAndColumnWrapper, List> dataRows, - String currUserAgencyId, Map checkBoxOptionColumnIdxAndLabel, - String currUserAgencyPids, String currentUserId, String tableName) { + String currUserAgencyId, Map checkBoxOptionColumnIdxAndLabel, + String currUserAgencyPids, String currentUserId, String tableName) { String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId(); // 遍历每一行，将行内容转化为 for (Map row : dataRows) { @@ -564,7 +572,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } catch (Exception e) { String errorMsg; - if (e instanceof RenException | e instanceof EpmetException) { + + if (e instanceof RenException) { + errorMsg = e.getMessage(); + } else if (e instanceof EpmetException) { errorMsg = e.getMessage(); } else { errorMsg = "未知系统错误"; @@ -574,6 +585,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res ErrorRow errorRow = new ErrorRow(); errorRow.setIdCard(columnAndValues.get("ID_CARD")); errorRow.setName(columnAndValues.get("NAME")); + errorRow.setMobile(columnAndValues.get("MOBILE")); errorRow.setErrorInfo(errorMsg); errorRow.setTableName(tableName); errorRows.get().get(IcResiUserTableEnum.IC_RESI_USER.getTableName()).add(errorRow); @@ -679,8 +691,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @param targetTableName 要插入到哪一个表 */ public List persistIcResiExtraInfo(Map headerColumnWrapper, List> dataRows, - String currUserAgencyId, Map checkBoxOptionColumnIdxAndLabel, - String currentUserId, String targetTableName, String customerId) { + String currUserAgencyId, Map checkBoxOptionColumnIdxAndLabel, + String currentUserId, String targetTableName, String customerId) { LinkedHashMap columnAndValues = new LinkedHashMap<>(); @@ -756,6 +768,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res ErrorRow errorRow = new ErrorRow(); errorRow.setName(columnAndValues.get("NAME")); errorRow.setIdCard(columnAndValues.get("ID_CARD")); + errorRow.setMobile(columnAndValues.get("MOBILE")); errorRow.setErrorInfo(errorMsg); errorRow.setTableName(targetTableName); errorRows.get().get(targetTableName).add(errorRow); @@ -784,6 +797,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ public void singlePersistResiVirtualSheetExtraInfo(Map columnAndValues, IcResiUserTableEnum sheetEnumObject) { String idCard = columnAndValues.get(ID_CARD_COLUMN_NO); + String name = columnAndValues.get(ID_NAME_COLUMN_NO); + String mobile = columnAndValues.get(MOBILE_COLUMN_NO); try { if (StringUtils.isBlank(idCard)) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), @@ -813,8 +828,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } ErrorRow errorRow = new ErrorRow(); - errorRow.setName(columnAndValues.get("NAME")); + errorRow.setName(name); errorRow.setIdCard(idCard); + errorRow.setMobile(mobile); errorRow.setErrorInfo(errorMsg); errorRow.setTableName(sheetEnumObject.getTableName()); errorRows.get().get(sheetEnumObject.getTableName()).add(errorRow); @@ -927,6 +943,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // 这两列要提前放进去，因为有的列未填写的话，会抛异常出去，需要用这两列来做描述 target2Insert.put("ID_CARD", row.get(ID_CARD_COLUMN_NO)); target2Insert.put("NAME", row.get(ID_NAME_COLUMN_NO)); + target2Insert.put("MOBILE", row.get(MOBILE_COLUMN_NO)); for (Map.Entry dbColumnMetadata : dbMetadataItemIdAndColumnWrappers.entrySet()) { @@ -1366,35 +1383,41 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } List options = null; + String optionTypeName = null; switch (pureUri) { case "/gov/org/customergrid/gridoption": + optionTypeName = "网格"; GridOptionFormDTO form = new GridOptionFormDTO(); form.setAgencyId(currUserAgencyId); form.setPurpose(purpose); options = getResultDataOrThrowsException(govOrgOpenFeignClient.getGridOption(form), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/gov/org/customerpartybranch/branchoption": - + optionTypeName = "所属支部"; CustomerPartyBranchDTO bform = new CustomerPartyBranchDTO(); bform.setGridId(cascadeItemColumnWrapper.getColValue()); options = getResultDataOrThrowsException(govOrgOpenFeignClient.getBranchOption(bform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/gov/org/icbuilding/buildingoption": + optionTypeName = "楼栋"; IcBuildingDTO buildingform = new IcBuildingDTO(); buildingform.setNeighborHoodId(cascadeItemColumnWrapper.getColValue()); options = getResultDataOrThrowsException(govOrgOpenFeignClient.getBuildingOptions(buildingform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/gov/org/icbuildingunit/unitoption": + optionTypeName = "单元"; IcBuildingUnitDTO buForm = new IcBuildingUnitDTO(); buForm.setBuildingId(cascadeItemColumnWrapper.getColValue()); options = getResultDataOrThrowsException(govOrgOpenFeignClient.getUnitOptions(buForm), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/gov/org/ichouse/houseoption": + optionTypeName = "房屋"; HouseFormDTO hform = new HouseFormDTO(); hform.setUnitId(cascadeItemColumnWrapper.getColValue()); options = getResultDataOrThrowsException(govOrgOpenFeignClient.getHouseOption(hform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/gov/org/icneighborhood/neighborhoodoption": + optionTypeName = "所属小区"; IcNeighborHoodDTO nform = new IcNeighborHoodDTO(); String gridId = cascadeItemColumnWrapper.getColValue(); if (StringUtils.isBlank(gridId)){ @@ -1405,21 +1428,27 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res options = getResultDataOrThrowsException(govOrgOpenFeignClient.getNeighborHoodOptions(nform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/education": + optionTypeName = "文化程度"; options = getResultDataOrThrowsException(adminOpenFeignClient.getEducationOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/house": + optionTypeName = "住房性质"; options = getResultDataOrThrowsException(adminOpenFeignClient.getHouseOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/nation": + optionTypeName = "民族"; options = getResultDataOrThrowsException(adminOpenFeignClient.getNationOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/ninesmallplaces": + optionTypeName = "九小场所"; options = getResultDataOrThrowsException(adminOpenFeignClient.getNineSmallPlacesOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/relationship": + optionTypeName = "人员关系"; options = getResultDataOrThrowsException(adminOpenFeignClient.getRelationshipOption(), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/resi/partymember/icPartyOrg/branchlist": + optionTypeName = "所属支部"; options = this.listBranchOptions(); break; default: @@ -1430,8 +1459,16 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res if (options == null) { return null; } + try { + return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + } catch (Exception e) { + String erroMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【居民信息导入】{}转化Options为map失败，url:{}, cascadeItemId:{}, currUserAgencyId:{},错误信息:{}", + optionTypeName, pureUri, cascadeItemId, currUserAgencyId, erroMsg); - return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + String hintMsg = optionTypeName + "解析失败"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), hintMsg, hintMsg); + } // 通用api调用，无法实现 /*if (!uri.startsWith("/api")) uri = "/api".concat(uri); @@ -2019,7 +2056,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // 保存 changeDetail for (Map.Entry newCategories : newData.getCategories().entrySet()) { String key = newCategories.getKey(); - String newValue = newCategories.getValue(); + String newValue = newCategories.getValue(); // 现在是这个类型，这个类型要+1 if ("1".equals(newValue)) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index c6249ea224..29a68a7529 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -11,7 +11,7 @@ del_flag = 1 WHERE del_flag = 0 AND attention_type = #{attentionType} - AND id_card IN ( + AND id IN ( #{l} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 5c4ad0b6e7..1bbaeeaa3b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -139,24 +139,6 @@ DELETE FROM ic_nat WHERE id = #{icNatId} - - INSERT INTO epmet_user.ic_nat - (ID, CUSTOMER_ID, AGENCY_ID, PIDS, USER_ID, - USER_TYPE, NAME, MOBILE, ID_CARD, NAT_TIME, NAT_RESULT, NAT_ADDRESS, FILE_NAME, ATTACHMENT_TYPE, ATTACHMENT_URL, - DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME) - VALUES (#{id}, #{customerId}, #{agencyId}, #{pids}, #{userId}, - #{userType}, #{name}, #{mobile}, #{idCard}, #{natTime}, - #{natResult}, #{natAddress}, #{fileName}, #{attachmentType}, #{attachmentUrl}, - #{delFlag}, #{revision}, #{createdBy}, #{createdTime}, #{updatedBy}, - #{updatedTime}) - ON DUPLICATE KEY update - NAME=#{name}, - MOBILE=#{mobile}, - NAT_ADDRESS=#{natAddress}, - NAT_RESULT=#{natResult}, - UPDATED_BY=#{updatedBy}, - UPDATED_TIME=NOW() - UPDATE ic_nat m, ( 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 c70fa707dd..73d9b8ee4d 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 @@ -1192,57 +1192,58 @@ and ru.MOBILE != '' and ru.PIDS like CONCAT('%',#{communityId},'%') +