From a84bef66bf6a2fb2424be454ae8a81c91fbcf1c9 Mon Sep 17 00:00:00 2001 From: hujl Date: Mon, 17 Jan 2022 09:09:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=92=8C=E6=8E=92=E9=99=A4=E5=B0=81=E8=A3=85=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/emr/controller/faultController.java | 4 ++-- .../java/com/emr/controller/lastVerifyController.java | 9 +++++---- .../emr/service/ipml/Emr_Fault_DetailServiceImpl.java | 2 +- src/main/resources/mapper/Archive_MasterMapper.xml | 6 +++--- src/main/resources/mapper/V_CountMapper.xml | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index 80d7531a..81fe1482 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -105,7 +105,7 @@ public class faultController { if(faultInfo.getArchiveDetailId().equals(backInfo.getArchiveDetailId())) { if(backInfo.getCreateTime()!=null && backInfo.getCreateTime()!=""){ if(backInfo.getStartDateTo()!=null && backInfo.getStartDateTo()!="" && backInfo.getEndDateTo()!=null && backInfo.getEndDateTo()!=""){ - SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); Date nowTime = ft.parse(backInfo.getCreateTime()); Date startTime = ft.parse(backInfo.getStartDateTo()); Date endTime = ft.parse(backInfo.getEndDateTo()); @@ -152,7 +152,7 @@ public class faultController { System.out.println("耗时：" + (end - start) / 1000 + "秒");*/ } public boolean compare(String time1,String time2) throws ParseException { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date a=sdf.parse(time1); Date b=sdf.parse(time2); //a早于b返回true diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index aad14c44..a32fa72d 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -254,15 +254,16 @@ public class lastVerifyController { emrFaultDetail.setCreater(username); emrFaultDetail.setCreateTime(nowTime); emrFaultDetail.setState("未召回"); - //判断是否已经有召回记录 - /*Emr_Fault_Vo vo=new Emr_Fault_Vo(); - vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());*/ + //暂时优化不改动流程（每次初审通过后，都会删除已有的召回记录，并插入新的未召回记录） bol = emrFaultDetailService.delbyCol(emrFaultDetail); if(bol>=0) { emrFaultDetailService.insertSel(emrFaultDetail); } - /*List list = emrFaultDetailService.selectByCol(vo); + /*判断是否已经有召回记录 + Emr_Fault_Vo vo=new Emr_Fault_Vo(); + vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); + List list = emrFaultDetailService.selectByCol(vo); if(list.size()>0){ //存在归档记录 bol = emrFaultDetailService.delbyCol(emrFaultDetail); diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index a66ff322..b8ec6439 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -581,7 +581,7 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { } public boolean compare(String time1,String time2) throws ParseException{ - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date a=sdf.parse(time1); Date b=sdf.parse(time2); //a早于b返回true diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index aef78578..ce4aef72 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -959,7 +959,7 @@