Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 400d8b6d by huangjinxin
Options

fix：甘特图优化

1 parent ee9fc420
Inline Side-by-side
Showing with 3 additions and 2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java
package com.dituhui.pea.order.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.common.DateUtils;
import com.dituhui.pea.order.common.EngineerUtils;
......@@ -64,8 +65,8 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
slot.setOrderId(order.getOrderId());
slot.setServiceStatus(order.getServiceStatus());
if (checkOrderIsFinish(order.getServiceStatus())) {
slot.setBtime(getHourMinute(order.getActualStartTime()));
slot.setEtime(getHourMinute(order.getActualEndTime()));
slot.setBtime(ObjectUtil.isNull(order.getActualStartTime()) ? null : getHourMinute(order.getActualStartTime()));
slot.setEtime(ObjectUtil.isNull(order.getActualEndTime()) ? null :getHourMinute(order.getActualEndTime()));
} else if (order.getPlanStartTime() != null && StringUtils.isNotEmpty(order.getPlanStartTime().toString())) {
slot.setBtime(getHourMinute(order.getPlanStartTime()));
slot.setEtime(getHourMinute(order.getPlanEndTime()));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!