diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 9cdf953..d34b985 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -49,11 +49,20 @@ public class SieveModel extends BaseModel { private String publishName; //数据来源 0 自动跑进来的 1 建档进来 2 产筛申请进来 private String from; + //申请产筛时间 + private Date applyDate; private Date created; private Date modified; private Integer yn; + public Date getApplyDate() { + return applyDate; + } + + public void setApplyDate(Date applyDate) { + this.applyDate = applyDate; + } public String getCardNo() { return cardNo; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index b5c60a1..22f9330 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -265,6 +265,9 @@ public class ApplyOrderFacade { if (CollectionUtils.isNotEmpty(sieveModels)) { SieveModel sieveModel = sieveModels.get(0); sieveModel.setStatus(2); + if(StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())){ + sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate())); + } int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date()); sieveModel.setDueWeek(days); sieveService.updateOneChanQianDiaSieve(sieveModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index c4faab2..6017095 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -31,6 +31,16 @@ public class SieveListResult implements IBasicResultConvert