From 57fa05befa9848d76c2e6ca60cc6f74a4a4f8ab4 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 26 Feb 2018 16:47:59 +0800 Subject: [PATCH] 1 --- .../java/com/lyms/platform/query/TrackDownRecordQuery.java | 14 ++++++++++++++ .../lyms/platform/operate/web/facade/TrackDownFacade.java | 2 +- .../platform/operate/web/facade/TrackDownJobFacade.java | 8 ++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index efd0e57..e945722 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -184,7 +184,21 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ condition = condition.and("pid", pids, MongoOper.IN); } + Criteria c1 = null; + + if(StringUtils.isNotEmpty(key)){ + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("phone", key, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("username", "^" + key, MongoOper.LIKE); + MongoCondition con3 = MongoCondition.newInstance("cardNo", key, MongoOper.IS); + if (c1 != null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria()); + } else { + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); + } + } + if (null != lastMensesStart) { if (null != c1) { c1 = c1.and("lastMenses").gte(lastMensesStart); 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 00b7bc6..1e56a60 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 @@ -109,7 +109,7 @@ public class TrackDownFacade { downRecordQuery.setProvinceId(downQueryRequest.getProvinceId()); downRecordQuery.setCityId(downQueryRequest.getCityId()); downRecordQuery.setStreetId(downQueryRequest.getStreetId()); - + downRecordQuery.setKey(downQueryRequest.getKey()); //如果是产筛请求 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java index b99b766..b26db05 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java @@ -410,12 +410,12 @@ public class TrackDownJobFacade { public TrackDownRecord build(ResidentsArchiveModel model) { TrackDownRecord record = new TrackDownRecord(); record.setResidentsArchiveId(model.getId()); - record.setAddressRegister(model.getAddressRegister()); - record.setAreaRegisterId(model.getAreaRegisterId()); + record.setAddressRegister(model.getAddress()); + record.setAreaRegisterId(model.getAreaId()); record.setBirth(model.getBirthday()); - record.setCityRegisterId(model.getCityRegisterId()); + record.setCityRegisterId(model.getCityId()); record.setUsername(model.getUsername()); - record.setStreetRegisterId(model.getStreetRegisterId()); + record.setStreetRegisterId(model.getStreetId()); record.setPhone(model.getPhone()); record.setHospitalId(model.getHospitalId()); record.setStatus(1); -- 1.8.3.1