jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c95a72c2692ea31309c459d4d9e0475383fa9cc5

Authored by yangfei
1 parent bf9c0970a0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

追访bug修改

Showing 3 changed files with 16 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java View file @ c95a72c
... ... @@ -7,7 +7,7 @@
7 7 import java.util.Date;
8 8  
9 9 /**
10   - * 追访
  10 + * 追访详情
11 11 */
12 12 @Document(collection="lyms_track_down")
13 13 public class TrackDown extends BaseModel {
... ... @@ -15,6 +15,11 @@
15 15 private static final long serialVersionUID = SerialIdEnum.TrackDown.getCid();
16 16  
17 17 private String id;
  18 +
  19 + /**
  20 + * 追访ID
  21 + */
  22 + private Date trackDownRecId;
18 23  
19 24 private String parentId;
20 25  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ c95a72c
... ... @@ -113,7 +113,7 @@
113 113 //如果是产筛请求
114 114 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
115 115 downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
116   - downRecordQuery.setTrackTypes(Arrays.asList(4,8));
  116 + downRecordQuery.setTrackTypes(Arrays.asList(3,8));
117 117 }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()){
118 118 downRecordQuery.setTrackTypes(Arrays.asList(3,9));
119 119 }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()){
... ... @@ -198,7 +198,6 @@
198 198 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
199 199  
200 200 List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
201   -
202 201 List<Map> data = new ArrayList<>();
203 202 TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());
204 203 if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) {
... ... @@ -242,6 +241,7 @@
242 241 temp.put("parentId", downRecord.getParentId());
243 242 temp.put("username", downRecord.getUsername());
244 243 temp.put("cardNo", downRecord.getCardNo());
  244 + temp.put("trackDownDateType", downRecord.getTrackType());
245 245 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
246 246 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
247 247 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
... ... @@ -286,6 +286,7 @@
286 286 temp.put("parentId", downRecord.getParentId());
287 287 temp.put("username", downRecord.getUsername());
288 288 temp.put("cardNo", downRecord.getCardNo());
  289 + temp.put("trackDownDateType", downRecord.getTrackType());
289 290 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
290 291 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
291 292 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
... ... @@ -312,6 +313,7 @@
312 313 temp.put("id", downRecord.getId());
313 314 temp.put("pid", downRecord.getPid());
314 315 temp.put("parentId", downRecord.getParentId());
  316 + temp.put("trackDownDateType", downRecord.getTrackType());
315 317 temp.put("username", downRecord.getUsername());
316 318 temp.put("cardNo", downRecord.getCardNo());
317 319 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
... ... @@ -341,6 +343,8 @@
341 343 temp.put("parentId", downRecord.getResidentsArchiveId());
342 344 temp.put("username", downRecord.getUsername());
343 345 temp.put("cardNo", downRecord.getCardNo());
  346 + temp.put("trackDownDateType", downRecord.getTrackType());
  347 +
344 348 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
345 349 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
346 350 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);
... ... @@ -367,6 +371,7 @@
367 371 temp.put("username", downRecord.getUsername());
368 372 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
369 373 temp.put("cardNo", StringUtils.encryCardNo(downRecord.getCardNo()));
  374 + temp.put("trackDownDateType", downRecord.getTrackType());
370 375 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
371 376 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
372 377 temp.put("id", downRecord.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ c95a72c
... ... @@ -245,11 +245,12 @@
245 245 //如果需要进入的列表没有这个人的记录
246 246 if(0==trackDownRecordService.queryTrackDownCount(trackDownRecordQuery)){
247 247 trackDownRecord.setTrackType(nextId);
248   - trackDownRecordService.updateTrackDown(trackDownRecord, id);
249 248 }else {
  249 + //设置为不显示
250 250 trackDownRecord.setStatus(0);
251   - trackDownRecordService.updateTrackDown(trackDownRecord,id);
252 251 }
  252 + trackDownRecordService.updateTrackDown(trackDownRecord,id);
  253 +
253 254 } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) {
254 255 TrackDownRecord trackDownRecord = new TrackDownRecord();
255 256 trackDownRecord.setStatus(0);