jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 57fa05befa9848d76c2e6ca60cc6f74a4a4f8ab4

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

1

Showing 3 changed files with 19 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java View file @ 57fa05b
... ... @@ -184,7 +184,21 @@
184 184 condition = condition.and("pid", pids, MongoOper.IN);
185 185 }
186 186  
  187 +
187 188 Criteria c1 = null;
  189 +
  190 + if(StringUtils.isNotEmpty(key)){
  191 + MongoCondition c = MongoCondition.newInstance();
  192 + MongoCondition con1 = MongoCondition.newInstance("phone", key, MongoOper.IS);
  193 + MongoCondition con2 = MongoCondition.newInstance("username", "^" + key, MongoOper.LIKE);
  194 + MongoCondition con3 = MongoCondition.newInstance("cardNo", key, MongoOper.IS);
  195 + if (c1 != null) {
  196 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria());
  197 + } else {
  198 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
  199 + }
  200 + }
  201 +
188 202 if (null != lastMensesStart) {
189 203 if (null != c1) {
190 204 c1 = c1.and("lastMenses").gte(lastMensesStart);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 57fa05b
... ... @@ -109,7 +109,7 @@
109 109 downRecordQuery.setProvinceId(downQueryRequest.getProvinceId());
110 110 downRecordQuery.setCityId(downQueryRequest.getCityId());
111 111 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
112   -
  112 + downRecordQuery.setKey(downQueryRequest.getKey());
113 113 //如果是产筛请求
114 114 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
115 115 downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java View file @ 57fa05b
... ... @@ -410,12 +410,12 @@
410 410 public TrackDownRecord build(ResidentsArchiveModel model) {
411 411 TrackDownRecord record = new TrackDownRecord();
412 412 record.setResidentsArchiveId(model.getId());
413   - record.setAddressRegister(model.getAddressRegister());
414   - record.setAreaRegisterId(model.getAreaRegisterId());
  413 + record.setAddressRegister(model.getAddress());
  414 + record.setAreaRegisterId(model.getAreaId());
415 415 record.setBirth(model.getBirthday());
416   - record.setCityRegisterId(model.getCityRegisterId());
  416 + record.setCityRegisterId(model.getCityId());
417 417 record.setUsername(model.getUsername());
418   - record.setStreetRegisterId(model.getStreetRegisterId());
  418 + record.setStreetRegisterId(model.getStreetId());
419 419 record.setPhone(model.getPhone());
420 420 record.setHospitalId(model.getHospitalId());
421 421 record.setStatus(1);