From c95a72c2692ea31309c459d4d9e0475383fa9cc5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 26 Feb 2018 15:31:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java | 7 ++++++- .../com/lyms/platform/operate/web/facade/TrackDownFacade.java | 9 +++++++-- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 5 +++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java index b1d0c9a..95c7c26 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; /** - * 追访 + * 追访详情 */ @Document(collection="lyms_track_down") public class TrackDown extends BaseModel { @@ -16,6 +16,11 @@ public class TrackDown extends BaseModel { private String id; + /** + * 追访ID + */ + private Date trackDownRecId; + private String parentId; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 52ec76a..e80f307 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -113,7 +113,7 @@ public class TrackDownFacade { //如果是产筛请求 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); - downRecordQuery.setTrackTypes(Arrays.asList(4,8)); + downRecordQuery.setTrackTypes(Arrays.asList(3,8)); }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()){ downRecordQuery.setTrackTypes(Arrays.asList(3,9)); }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()){ @@ -198,7 +198,6 @@ public class TrackDownFacade { TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); - List data = new ArrayList<>(); TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType()); if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) { @@ -242,6 +241,7 @@ public class TrackDownFacade { temp.put("parentId", downRecord.getParentId()); temp.put("username", downRecord.getUsername()); temp.put("cardNo", downRecord.getCardNo()); + temp.put("trackDownDateType", downRecord.getTrackType()); temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); 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 @@ public class TrackDownFacade { temp.put("parentId", downRecord.getParentId()); temp.put("username", downRecord.getUsername()); temp.put("cardNo", downRecord.getCardNo()); + temp.put("trackDownDateType", downRecord.getTrackType()); temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); 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 @@ public class TrackDownFacade { temp.put("id", downRecord.getId()); temp.put("pid", downRecord.getPid()); temp.put("parentId", downRecord.getParentId()); + temp.put("trackDownDateType", downRecord.getTrackType()); temp.put("username", downRecord.getUsername()); temp.put("cardNo", downRecord.getCardNo()); temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ @@ -341,6 +343,8 @@ public class TrackDownFacade { temp.put("parentId", downRecord.getResidentsArchiveId()); temp.put("username", downRecord.getUsername()); temp.put("cardNo", downRecord.getCardNo()); + temp.put("trackDownDateType", downRecord.getTrackType()); + temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); 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 @@ public class TrackDownFacade { temp.put("username", downRecord.getUsername()); temp.put("age", DateUtil.getAge(downRecord.getBirth())); temp.put("cardNo", StringUtils.encryCardNo(downRecord.getCardNo())); + temp.put("trackDownDateType", downRecord.getTrackType()); temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); temp.put("id", downRecord.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 7a556fa..2d0b173 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -245,11 +245,12 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS //如果需要进入的列表没有这个人的记录 if(0==trackDownRecordService.queryTrackDownCount(trackDownRecordQuery)){ trackDownRecord.setTrackType(nextId); - trackDownRecordService.updateTrackDown(trackDownRecord, id); }else { + //设置为不显示 trackDownRecord.setStatus(0); - trackDownRecordService.updateTrackDown(trackDownRecord,id); } + trackDownRecordService.updateTrackDown(trackDownRecord,id); + } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) { TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setStatus(0); -- 1.8.3.1