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; //任务是下午下班之后发布的,且是下班之后提交的,没有多余工作时间