diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 8da611d..62c2dd4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -545,7 +545,7 @@ public class ResidentsArchiveFacade{ Map map = new HashMap<>(); map.put("id",model.getId()); map.put("username",model.getUsername()); - map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum())); + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum())); map.put("age",DateUtil.getAge(model.getBirthday())); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); @@ -623,7 +623,7 @@ public class ResidentsArchiveFacade{ map.put("nationId",FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService)); map.put("marriageId",FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(), basicConfigService)); map.put("certificateTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(), basicConfigService)); - map.put("certificateNum",DefenceUtils.getId(data.getCertificateNum())); + map.put("certificateNum",FunvCommonUtil.getId(data.getCertificateNum())); map.put("censusTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(), basicConfigService)); map.put("liveTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(), basicConfigService)); map.put("levelTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(), basicConfigService)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index 2fc417e..c4879db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -174,7 +174,7 @@ public class ResidentsFacade { for (ResidentsArchiveModel model : modelList){ Map map = new HashMap<>(); map.put("username",model.getUsername()); - map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum())); + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum())); map.put("age",DateUtil.getAge(model.getBirthday())); map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityId(), model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService)); @@ -360,7 +360,7 @@ public class ResidentsFacade { map.put("nationId",FunvCommonUtil.getBaseicConfigByid(data.getNationId(),basicConfigService)); map.put("marriageId",FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(),basicConfigService)); map.put("certificateTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(),basicConfigService)); - map.put("certificateNum",DefenceUtils.getId(data.getCertificateNum())); + map.put("certificateNum",FunvCommonUtil.getId(data.getCertificateNum())); map.put("censusTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(),basicConfigService)); map.put("liveTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(),basicConfigService)); map.put("levelTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(),basicConfigService));