jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 68f0896879efd45d1d4511ad77cb0f63f1fef8b3

Authored by hujiaqi
2 parents 9deff97535 dbfe694a7b
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 68f0896
... ... @@ -11,6 +11,7 @@
11 11 import com.lyms.platform.common.result.BaseObjectResponse;
12 12 import com.lyms.platform.common.result.BaseResponse;
13 13 import com.lyms.platform.common.utils.DateUtil;
  14 +import com.lyms.platform.common.utils.DefenceUtils;
14 15 import com.lyms.platform.common.utils.ExcelUtil;
15 16 import com.lyms.platform.common.utils.SystemConfig;
16 17 import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
... ... @@ -151,7 +152,7 @@
151 152 archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(),
152 153 archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService));
153 154 archiveMap.put("workUnit", archiveModel.getWorkUnit());
154   - archiveMap.put("buildDay", archiveModel.getBuildDay());
  155 + archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay()));
155 156 }
156 157  
157 158 resultMap.put("archiveResult", archiveMap);
... ... @@ -416,7 +417,7 @@
416 417 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
417 418 map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
418 419 map.put("username", model.getUsername());
419   - map.put("certificateNum", model.getCertificateNum());
  420 + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
420 421 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
421 422 if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
422 423 map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
423 424  
... ... @@ -821,12 +822,18 @@
821 822 String username = "";
822 823 String phone = "";
823 824 Integer age = null;
  825 + String certificateTypeId = "";
  826 + String certificateNum = "";
  827 + String vcCardNo = "";
824 828  
825 829 if (StringUtils.isNotEmpty(checkup.getParentId())){
826 830 ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId());
827 831 if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){
828 832 username = archiveModel.getUsername();
829 833 phone = archiveModel.getPhone();
  834 + certificateTypeId = archiveModel.getCertificateTypeId();
  835 + certificateNum = archiveModel.getCertificateNum();
  836 + vcCardNo = archiveModel.getVcCardNo();
830 837 if (archiveModel.getBirthday()!=null){
831 838 age = DateUtil.getAge(archiveModel.getBirthday());
832 839 }
... ... @@ -844,9 +851,9 @@
844 851 }
845 852 }
846 853 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
847   - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId()));
848   - map.put("certificateNum", checkup.getCertificateTypeId());
849   - map.put("vcCardNo", checkup.getVcCardNo());
  854 + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId));
  855 + map.put("certificateNum", DefenceUtils.getId(certificateNum));
  856 + map.put("vcCardNo", vcCardNo);
850 857 map.put("sexType", "女");
851 858 if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) {
852 859 map.put("deliverStatus", "提供");
853 860  
... ... @@ -1184,12 +1191,18 @@
1184 1191 String username = "";
1185 1192 String phone = "";
1186 1193 Integer age = null;
  1194 + String certificateTypeId = "";
  1195 + String certificateNum = "";
  1196 + String vcCardNo = "";
1187 1197  
1188 1198 if (StringUtils.isNotEmpty(checkup.getParentId())){
1189 1199 ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId());
1190 1200 if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){
1191 1201 username = archiveModel.getUsername();
1192 1202 phone = archiveModel.getPhone();
  1203 + certificateTypeId = archiveModel.getCertificateTypeId();
  1204 + certificateNum = archiveModel.getCertificateNum();
  1205 + vcCardNo = archiveModel.getVcCardNo();
1193 1206 if (archiveModel.getBirthday()!=null){
1194 1207 age = DateUtil.getAge(archiveModel.getBirthday());
1195 1208 }
... ... @@ -1207,9 +1220,9 @@
1207 1220 }
1208 1221 }
1209 1222 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
1210   - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId()));
1211   - map.put("certificateNum", checkup.getCertificateTypeId());
1212   - map.put("vcCardNo", checkup.getVcCardNo());
  1223 + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId));
  1224 + map.put("certificateNum", DefenceUtils.getId(certificateNum));
  1225 + map.put("vcCardNo", vcCardNo);
1213 1226 map.put("sexType", "男");
1214 1227 if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) {
1215 1228 map.put("deliverStatus", "提供");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 68f0896
... ... @@ -632,7 +632,7 @@
632 632 }
633 633 }
634 634 map.put("age",data.getAge());
635   - map.put("phone",data.getPhone());
  635 + map.put("phone",DefenceUtils.getPhone(data.getPhone()));
636 636 map.put("workUnit",data.getWorkUnit());
637 637 map.put("residence",CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
638 638 data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java View file @ 68f0896
... ... @@ -372,7 +372,7 @@
372 372 }
373 373 }
374 374 map.put("age",data.getAge());
375   - map.put("phone",data.getPhone());
  375 + map.put("phone",DefenceUtils.getPhone(data.getPhone()));
376 376 map.put("workUnit",data.getWorkUnit());
377 377 map.put("residence",CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
378 378 data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));