jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4a3a71493c1e58114f373d12e049e7dd9a82ee4d

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

追访修改

Showing 4 changed files with 29 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java View file @ 4a3a714
... ... @@ -172,6 +172,9 @@
172 172 if (null != parentIds) {
173 173 condition = condition.and("parentId", parentIds, MongoOper.IN);
174 174 }
  175 + if (null != overTimes) {
  176 + condition = condition.and("overTimes", overTimes, MongoOper.IN);
  177 + }
175 178  
176 179 if (null != pids) {
177 180 condition = condition.and("pid", pids, MongoOper.IN);
... ... @@ -502,6 +505,18 @@
502 505 }
503 506 return condition.toMongoQuery();
504 507 }
  508 +
  509 +
  510 + private Integer overTimes;
  511 +
  512 + public Integer getOverTimes() {
  513 + return overTimes;
  514 + }
  515 +
  516 + public void setOverTimes(Integer overTimes) {
  517 + this.overTimes = overTimes;
  518 + }
  519 +
505 520  
506 521 public Date getNextCheckTimeEnd() {
507 522 return nextCheckTimeEnd;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 4a3a714
... ... @@ -502,6 +502,7 @@
502 502 downRecordQuery.setCityId(downQueryRequest.getCityId());
503 503 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
504 504 downRecordQuery.setKey(downQueryRequest.getKey());
  505 + downRecordQuery.setOverTimes(downQueryRequest.getOverTimes());
505 506  
506 507 //产检逾期天数
507 508 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
... ... @@ -857,6 +858,7 @@
857 858 {
858 859 for (TrackDownRecord downRecord : downRecordList)
859 860 {
  861 + downRecord.setOverTimes(downRecord.getOverTimes() == null ? 1 : downRecord.getOverTimes()+1);
860 862 downRecord.setNextCheckTime(DateUtil.addDay(time,7));
861 863 trackDownRecordService.updateTrackDown(downRecord,downRecord.getId());
862 864 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java View file @ 4a3a714
... ... @@ -101,6 +101,16 @@
101 101  
102 102 private boolean isArea;
103 103  
  104 + private Integer overTimes;
  105 +
  106 + public Integer getOverTimes() {
  107 + return overTimes;
  108 + }
  109 +
  110 + public void setOverTimes(Integer overTimes) {
  111 + this.overTimes = overTimes;
  112 + }
  113 +
104 114 public Integer getCheckOverDaysStart() {
105 115 return checkOverDaysStart;
106 116 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 4a3a714
... ... @@ -834,10 +834,12 @@
834 834 if (trackDownRecord1.getStatus() < trackDownRecord.getStatus()) {
835 835 trackDownRecord.setStatus(trackDownRecord1.getStatus());
836 836 }
  837 + trackDownRecord.setOverTimes(0);
837 838 trackDownRecordService.updateTrackDown(trackDownRecord, trackDownRecord1.getId());
838 839 return true;
839 840 }
840 841 }
  842 + trackDownRecord.setOverTimes(0);
841 843 trackDownRecordService.addTrackDown(trackDownRecord);
842 844 return true;
843 845 } catch (Exception e) {