Commit 97d760b81d3a3ce15911cf15790df865481b4d28
1 parent
6c850cd59b
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 19 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
97d760b
| ... | ... | @@ -241,6 +241,7 @@ |
| 241 | 241 | mapData.put("firstBuildData", getResult(newModel)); |
| 242 | 242 | mapData.put("archiveHistory", resultList); |
| 243 | 243 | mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 244 | + mapData.put("premaritalCheckup", getPremaritalCheckup(newModel));//婚检信息 | |
| 244 | 245 | list.add(mapData); |
| 245 | 246 | |
| 246 | 247 | BaseListResponse listResponse = new BaseListResponse(); |
| ... | ... | @@ -249,6 +250,24 @@ |
| 249 | 250 | listResponse.setErrormsg("成功"); |
| 250 | 251 | return listResponse; |
| 251 | 252 | } |
| 253 | + | |
| 254 | + /** | |
| 255 | + * 获取婚检信息 | |
| 256 | + * @return | |
| 257 | + */ | |
| 258 | + private PremaritalCheckup getPremaritalCheckup(ResidentsArchiveModel newModel) | |
| 259 | + { | |
| 260 | + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); | |
| 261 | + query.setParentId(newModel.getId()); | |
| 262 | + query.setYn(YnEnums.YES.getId()); | |
| 263 | + List<PremaritalCheckup> datas = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "created", Sort.Direction.DESC); | |
| 264 | + if (CollectionUtils.isNotEmpty(datas)) | |
| 265 | + { | |
| 266 | + return datas.get(0); | |
| 267 | + } | |
| 268 | + return null; | |
| 269 | + } | |
| 270 | + | |
| 252 | 271 | |
| 253 | 272 | /** |
| 254 | 273 | * 查询居民基本信息 |