From f19169fa68c6b9a4fa712c8f1412b9e58348280b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 30 Mar 2018 17:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/SieveResultModel.java | 8 -------- .../lyms/platform/operate/web/controller/TestController.java | 12 ++++++------ .../com/lyms/platform/operate/web/facade/SieveFacade.java | 1 + 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java index 50ea845..5f3f02a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java @@ -35,8 +35,6 @@ public class SieveResultModel{ //结果录入时间 private Date resultTime; - //诊断结果时间 - private Date diagnosisTime; public Date getResultTime() { return resultTime; @@ -46,13 +44,7 @@ public class SieveResultModel{ this.resultTime = resultTime; } - public Date getDiagnosisTime() { - return diagnosisTime; - } - public void setDiagnosisTime(Date diagnosisTime) { - this.diagnosisTime = diagnosisTime; - } public String getStzhz13() { return stzhz13; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index d93e5dd..860f403 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1726,7 +1726,7 @@ public class TestController extends BaseController { if (CollectionUtils.isNotEmpty(list1)) { SieveApplyOrderModel applyOrderModel = list1.get(0); - if (applyOrderModel.getApplyTime() == null) + if (applyOrderModel.getApplyTime() == null) { applyOrderModel.setApplyTime(applyOrderModel.getCreated()); applyOrderService.updateSieve(applyOrderModel); @@ -1741,18 +1741,18 @@ public class TestController extends BaseController { if (CollectionUtils.isNotEmpty(sieveResultModels)) { SieveResultModel sieveResultModel = sieveResultModels.get(0); - if (sieveResultModel.getDiagnosisTime() == null) + if (sieveResultModel.getResultTime() == null) { - sieveResultModel.setDiagnosisTime(sieveResultModel.getCreated()); + sieveResultModel.setResultTime(sieveResultModel.getCreated()); sieveService.updateSieveRsult(sieveResultModel); - model.setDiagnosisTime(sieveResultModel.getCreated()); + model.setResultTime(sieveResultModel.getCreated()); sieveService.updateOneChanQianDiaSieve(model); } } - if (model.getResultTime() == null) + if (model.getStatus() == 3 && model.getDiagnosisTime() == null) { - model.setResultTime(model.getModified()); + model.setDiagnosisTime(model.getModified()); sieveService.updateOneChanQianDiaSieve(model); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 953f3df..e0db3de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -76,6 +76,7 @@ public class SieveFacade { private TrackDownRecordService trackDownRecordService; /** + * * 增加一条产筛结果记录 * * @param sieveAddRequest -- 1.8.3.1