Commit 0d4a0c7a37d9258f3d495ac5a5f0d0582c140506
1 parent
067660670f
Exists in
master
and in
6 other branches
修改追访不能显示上个流程的状态
Showing 1 changed file with 1 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
0d4a0c7
| ... | ... | @@ -337,7 +337,7 @@ |
| 337 | 337 | temp.put("cardNo", downRecord.getCardNo()); |
| 338 | 338 | temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ |
| 339 | 339 | temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); |
| 340 | - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); | |
| 340 | + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1).and("trackType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); | |
| 341 | 341 | temp.put("age", DateUtil.getAge(downRecord.getBirth())); |
| 342 | 342 | // 婚检追访结果 |
| 343 | 343 | temp.put("result", trackDown == null ? "--" : trackDown.getResult()); |