Skip to content

yangxiujun / paidan_demo

Go to a project
Commit a814bc14 by 王力
Options

Merge branch 'dev_order_info0725' into 'develop' 

接口新增字段

See merge request !272
2 parents c175609b fc5b5a33
Inline Side-by-side
Showing with 2 additions and 0 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
...@@ -17,6 +17,7 @@ public class OrderServiceList { ...@@ -17,6 +17,7 @@ public class OrderServiceList {
private Integer priority; private Integer priority;
private String expectTimeBegin; private String expectTimeBegin;
private String expectTimeEnd; private String expectTimeEnd;
private String expectTimeDesc;
private String source; private String source;
private String description; private String description;
private String orgBranchName; private String orgBranchName;
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
...@@ -130,6 +130,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -130,6 +130,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setExpectTimeBegin(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeBegin())); record.setExpectTimeBegin(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeBegin()));
record.setExpectTimeEnd(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeEnd())); record.setExpectTimeEnd(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeEnd()));
record.setExpectTimeDesc(o.getExpectTimeDesc());
record.setAppointmentStatus(o.getAppointmentStatus()); record.setAppointmentStatus(o.getAppointmentStatus());
record.setAppointmentType(o.getAppointmentMethod()); record.setAppointmentType(o.getAppointmentMethod());
record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime())); record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!