From 42c63c97574a0a952f51658984c2bd12f336f778 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 25 Aug 2016 11:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/SieveModel.java    |  9 +++++++++
 .../lyms/platform/operate/web/facade/ApplyOrderFacade.java  |  3 +++
 .../lyms/platform/operate/web/result/SieveListResult.java   | 13 +++++++++++++
 3 files changed, 25 insertions(+)

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<SieveListResult, Sie
     private String ztfx;
     //整体风险
     private String ztfxText=SPIT;
+    //申请时间
+    private String applyTime;
+
+    public String getApplyTime() {
+        return applyTime;
+    }
+
+    public void setApplyTime(String applyTime) {
+        this.applyTime = applyTime;
+    }
 
     public String getZtfxText() {
         if(null==ztfxText){
@@ -172,6 +182,9 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
         setId(destModel.getId());
         setParentId(destModel.getParentId());
         setName(destModel.getName());
+        if(null!=destModel.getApplyDate()){
+            setApplyTime(DateUtil.getyyyy_MM_dd(destModel.getApplyDate()));
+        }
         if(null!=destModel.getLastMenses()){
             int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date());
             this.cDueWeek= StringUtils.dueWeek(days);
-- 
1.8.3.1