Commit 51d3336d1ea4ff08b97a812e0bcddc58b594cafe
1 parent
4ad2e27222
Exists in
master
and in
7 other branches
update bug
Showing 1 changed file with 18 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
51d3336
| ... | ... | @@ -822,12 +822,18 @@ |
| 822 | 822 | String username = ""; |
| 823 | 823 | String phone = ""; |
| 824 | 824 | Integer age = null; |
| 825 | + String certificateTypeId = ""; | |
| 826 | + String certificateNum = ""; | |
| 827 | + String vcCardNo = ""; | |
| 825 | 828 | |
| 826 | 829 | if (StringUtils.isNotEmpty(checkup.getParentId())){ |
| 827 | 830 | ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId()); |
| 828 | 831 | if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){ |
| 829 | 832 | username = archiveModel.getUsername(); |
| 830 | 833 | phone = archiveModel.getPhone(); |
| 834 | + certificateTypeId = archiveModel.getCertificateTypeId(); | |
| 835 | + certificateNum = archiveModel.getCertificateNum(); | |
| 836 | + vcCardNo = archiveModel.getVcCardNo(); | |
| 831 | 837 | if (archiveModel.getBirthday()!=null){ |
| 832 | 838 | age = DateUtil.getAge(archiveModel.getBirthday()); |
| 833 | 839 | } |
| ... | ... | @@ -845,9 +851,9 @@ |
| 845 | 851 | } |
| 846 | 852 | } |
| 847 | 853 | map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); |
| 848 | - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId())); | |
| 849 | - map.put("certificateNum", DefenceUtils.getId(checkup.getCertificateNum())); | |
| 850 | - map.put("vcCardNo", checkup.getVcCardNo()); | |
| 854 | + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); | |
| 855 | + map.put("certificateNum", DefenceUtils.getId(certificateNum)); | |
| 856 | + map.put("vcCardNo", vcCardNo); | |
| 851 | 857 | map.put("sexType", "女"); |
| 852 | 858 | if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) { |
| 853 | 859 | map.put("deliverStatus", "提供"); |
| 854 | 860 | |
| ... | ... | @@ -1185,12 +1191,18 @@ |
| 1185 | 1191 | String username = ""; |
| 1186 | 1192 | String phone = ""; |
| 1187 | 1193 | Integer age = null; |
| 1194 | + String certificateTypeId = ""; | |
| 1195 | + String certificateNum = ""; | |
| 1196 | + String vcCardNo = ""; | |
| 1188 | 1197 | |
| 1189 | 1198 | if (StringUtils.isNotEmpty(checkup.getParentId())){ |
| 1190 | 1199 | ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId()); |
| 1191 | 1200 | if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){ |
| 1192 | 1201 | username = archiveModel.getUsername(); |
| 1193 | 1202 | phone = archiveModel.getPhone(); |
| 1203 | + certificateTypeId = archiveModel.getCertificateTypeId(); | |
| 1204 | + certificateNum = archiveModel.getCertificateNum(); | |
| 1205 | + vcCardNo = archiveModel.getVcCardNo(); | |
| 1194 | 1206 | if (archiveModel.getBirthday()!=null){ |
| 1195 | 1207 | age = DateUtil.getAge(archiveModel.getBirthday()); |
| 1196 | 1208 | } |
| ... | ... | @@ -1208,9 +1220,9 @@ |
| 1208 | 1220 | } |
| 1209 | 1221 | } |
| 1210 | 1222 | map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); |
| 1211 | - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId())); | |
| 1212 | - map.put("certificateNum", DefenceUtils.getId(checkup.getCertificateTypeId())); | |
| 1213 | - map.put("vcCardNo", checkup.getVcCardNo()); | |
| 1223 | + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); | |
| 1224 | + map.put("certificateNum", DefenceUtils.getId(certificateNum)); | |
| 1225 | + map.put("vcCardNo", vcCardNo); | |
| 1214 | 1226 | map.put("sexType", "男"); |
| 1215 | 1227 | if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) { |
| 1216 | 1228 | map.put("deliverStatus", "提供"); |