计算预计结束时间2.0

dev^2
chengyufei 1 year ago
parent 1943f257a6
commit dee8202b7a
  1. 1
      ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
  2. 1
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

@ -333,6 +333,7 @@ export default {
}, },
methods: { methods: {
expectedDuration() { expectedDuration() {
let param = { let param = {
startTime: this.model.startTime, startTime: this.model.startTime,
expectedDuration: this.model.expectedDuration, expectedDuration: this.model.expectedDuration,

@ -453,6 +453,7 @@ public class TaskController extends JeecgController<Task, ITaskService> {
workTime += endTime.getTime() - date3.getTime(); workTime += endTime.getTime() - date3.getTime();
return workTime; return workTime;
}else { }else {
//时间跨度没有超过两天 //时间跨度没有超过两天
if (startTime.compareTo(date4) >= 0) if (startTime.compareTo(date4) >= 0)
return workTime; //任务是下午下班之后发布的,且是下班之后提交的,没有多余工作时间 return workTime; //任务是下午下班之后发布的,且是下班之后提交的,没有多余工作时间

Loading…
Cancel
Save