Commit 3ec3f5eb by huangjinxin

fix:工单详情添加辅助工程师和work时间

1 parent 6abb93c3
...@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dto; ...@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dto;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -103,6 +104,31 @@ public class OrderServiceDetailResp { ...@@ -103,6 +104,31 @@ public class OrderServiceDetailResp {
* 是否超派,0否 1是,默认0 * 是否超派,0否 1是,默认0
*/ */
private Integer transcend; private Integer transcend;
/**
* 辅助工程师工号
*/
private String engineerCodeSub = "";
/**
* 计划开始时间
*/
private LocalDateTime planStartTime;
/**
* 计划结束时间
*/
private LocalDateTime planEndTime;
/**
* 开始服务时间
*/
private LocalDateTime actualStartTime;
/**
* 结束服务时间
*/
private LocalDateTime actualEndTime;
// //
// @Data // @Data
// @JsonInclude(JsonInclude.Include.NON_NULL) // @JsonInclude(JsonInclude.Include.NON_NULL)
......
...@@ -116,6 +116,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -116,6 +116,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
res.setMultipleOrders(order.getMultipleOrders()); res.setMultipleOrders(order.getMultipleOrders());
res.setBeanTags(order.getBeanTags()); res.setBeanTags(order.getBeanTags());
res.setTranscend(order.getTranscend()); res.setTranscend(order.getTranscend());
res.setEngineerCodeSub(order.getEngineerCodeSub());
res.setPlanStartTime(order.getPlanStartTime());
res.setPlanEndTime(order.getPlanEndTime());
res.setActualStartTime(order.getActualStartTime());
res.setActualEndTime(order.getActualEndTime());
return Result.success(res); return Result.success(res);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!