From a1eb17e4fd50a5969f39139f0c23e92df0630e11 Mon Sep 17 00:00:00 2001 From: "a15234804788@163.com" Date: Thu, 13 Oct 2022 14:24:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E6=97=B6=E9=97=B4=E4=B8=80=E5=BE=8B?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B9=B4=E6=9C=88=E6=97=A5=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/workflow/listener/TaskEventListener.java | 2 +- .../lims/capital/controller/CkOrderController.java | 7 ++++--- .../lims/goods/service/impl/ApplyServiceImpl.java | 2 +- .../springblade/lims/service/impl/EntrustServiceImpl.java | 4 ++-- .../springblade/system/user/test/TestUserController.java | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/listener/TaskEventListener.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/listener/TaskEventListener.java index 445eb6d..192aaf4 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/listener/TaskEventListener.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workflow/listener/TaskEventListener.java @@ -855,7 +855,7 @@ public class TaskEventListener implements TaskListener, ApplicationContextAware } // 18.接样日期 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); if (name.equals("samplingDate")) { try { entrust.setSamplingDate(simpleDateFormat.parse(value)); diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CkOrderController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CkOrderController.java index b22fb45..b3c790e 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CkOrderController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CkOrderController.java @@ -40,6 +40,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -301,7 +302,7 @@ public class CkOrderController extends BladeController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ApplyOrderDetail::getOrderId, id); List details = applyOrderDetailService.list(queryWrapper); - + SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); Long aLong = Long.valueOf(id); //需要批量生成的map @@ -319,9 +320,9 @@ public class CkOrderController extends BladeController { Map result = new HashMap<>(); result.put("applyUser", applyOrder.getApplyUser()); - result.put("applyTime", applyOrder.getApplyTime()); + result.put("applyTime", format.format(applyOrder.getApplyTime())); result.put("approvalUser", applyOrder.getApproveUser()); - result.put("approvalTime", applyOrder.getApproveTime()); + result.put("approvalTime", format.format(applyOrder.getApproveTime())); result.put("applyRemark", applyOrder.getReason()); result.put("resultList", resultList); diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java index 614de0e..6ca0b5a 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java @@ -81,7 +81,7 @@ public class ApplyServiceImpl extends BaseServiceImpl implem Map result = new HashMap<>(); // 申领人 result.put("applyUser", apply.getApplyUser()); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); // 申领时间 result.put("applyTime", format.format(apply.getApplyTime())); // 审批人 diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index f6d12db..5d0eb99 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -3217,7 +3217,7 @@ public class EntrustServiceImpl extends BaseServiceImpl } String name = userClient.userInfoById(Long.parseLong(taskBlueprint.getTaskIssuedBy())).getData().getName(); result.put("taskIssued", name);//任务下达人 - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); result.put("demandCompletionTime", format.format(eTask.getDemandCompletionTime())); result.put("simpleReceiverName", eTask.getSimpleReceiverName()); if (eTask.getSimpleReceiveTime() != null) { @@ -3406,7 +3406,7 @@ public class EntrustServiceImpl extends BaseServiceImpl queryWrapper.eq("set_id", simpleSet.getId()); List list1 = simpleService.list(queryWrapper); Entrust currEntrust = this.getById(simpleSet.getEntrustId()); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); for (Simple simple : list1) { Map map = new HashMap<>(); diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/test/TestUserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/test/TestUserController.java index f9e0c33..c52e53f 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/test/TestUserController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/test/TestUserController.java @@ -32,7 +32,6 @@ public class TestUserController { //路由key String luYouKey = "ttlmessage"; - MessagePostProcessor messagePostProcessor = new MessagePostProcessor() { @Override public Message postProcessMessage(Message message) throws AmqpException {