From b7238fe522b19cf64208b76c4c52efa45f4b3597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 28 Jan 2023 12:51:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 8 +++++++- .../java/com/xm/core/ctrl/XmTaskExecuserController.java | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index bda8b747..ec786b4d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -405,7 +405,13 @@ public class XmTaskController { } } can=can.stream().filter(i->!noExecs.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList()); - + if(can.size()>0 && xmTaskMap.containsKey("taskState")){ + String taskState= (String) xmTaskMap.get("taskState"); + if("3".equals(taskState)||"4".equals(taskState)||"9".equals(taskState)){ + xmTaskMap.put("endTime",new Date()); + xmTaskMap.put("actEndTime",new Date()); + } + } if(can.size()>0){ xmTaskMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList())); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index bc4b28ee..85877046 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -481,7 +481,11 @@ public class XmTaskExecuserController { return ResponseHelper.failed(tips); } } - + String taskState= xmTaskUpdate.getTaskState(); + if("3".equals(taskState)||"4".equals(taskState)||"9".equals(taskState)){ + xmTaskUpdate.setEndTime(new Date()); + xmTaskUpdate.setActEndTime(new Date()); + } xmTaskService.updateSomeFieldByPk(xmTaskUpdate); if("2".equals(xmTaskDb.getOshare()) && xmTaskDb.getShareFee()!=null && xmTaskDb.getShareFee().compareTo(BigDecimal.ZERO)>0){ mkClient.pushAfterTaskAcceptanceSuccess(xmTaskDb.getExecutorUserid(),xmTaskDb.getExecutorUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());