From dee8202b7ae91665055fa0e70ed5d7b2451b6bde Mon Sep 17 00:00:00 2001 From: chengyufei <1932574737@qq.com> Date: Fri, 28 Jul 2023 17:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=A2=84=E8=AE=A1=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue | 1 + .../java/org/jeecg/modules/task/controller/TaskController.java | 1 + 2 files changed, 2 insertions(+) diff --git a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue index 399f3b8..d8dd52f 100644 --- a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue +++ b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue @@ -333,6 +333,7 @@ export default { }, methods: { expectedDuration() { + let param = { startTime: this.model.startTime, expectedDuration: this.model.expectedDuration, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java index fafd347..9305384 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java @@ -453,6 +453,7 @@ public class TaskController extends JeecgController { workTime += endTime.getTime() - date3.getTime(); return workTime; }else { + //时间跨度没有超过两天 if (startTime.compareTo(date4) >= 0) return workTime; //任务是下午下班之后发布的,且是下班之后提交的,没有多余工作时间