Commit 7a3c9c68 by huangjinxin

fix:工单列表返回添加标签

1 parent dce1ad50
...@@ -90,4 +90,14 @@ public class OrderServiceList { ...@@ -90,4 +90,14 @@ public class OrderServiceList {
* bean同步地址id * bean同步地址id
*/ */
private String addressId; private String addressId;
/**
* 是否是cutoff,0否 1是 默认0
*/
private Integer isCutoff;
/**
* 改约原因
*/
private String reschedulingReason;
} }
...@@ -98,4 +98,14 @@ public class OrderInfo { ...@@ -98,4 +98,14 @@ public class OrderInfo {
* 是否是特殊时间段,0否 1是 默认0 * 是否是特殊时间段,0否 1是 默认0
*/ */
private Integer isSpecialTime; private Integer isSpecialTime;
/**
* 是否是cutoff,0否 1是 默认0
*/
private Integer isCutoff;
/**
* 改约原因
*/
private String reschedulingReason;
} }
\ No newline at end of file
...@@ -158,6 +158,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -158,6 +158,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setTranscend(o.getTranscend()); record.setTranscend(o.getTranscend());
record.setIsSpecialTime(o.getIsSpecialTime()); record.setIsSpecialTime(o.getIsSpecialTime());
record.setAddressId(o.getAddressId()); record.setAddressId(o.getAddressId());
record.setIsCutoff(o.getIsCutoff());
record.setReschedulingReason(o.getReschedulingReason());
record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime())); record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime()));
record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime())); record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime()));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!