Skip to content

yangxiujun / paidan_demo

Go to a project
Commit b33d6ba8 by 王力
Options

Merge branch 'dev_order_detail0728' into 'develop' 

工单列表新增返回字段

See merge request !295
2 parents d2e5bb24 c503cdaf
Inline Side-by-side
Showing with 10 additions and 3 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
...@@ -24,8 +24,11 @@ public class OrderServiceList { ...@@ -24,8 +24,11 @@ public class OrderServiceList {
private String orgBranchName; private String orgBranchName;
private Integer engineerNum; private Integer engineerNum;
private String engineerNames; private String engineerNames;
private String dispatcher;
private String appointmentTime; private String appointmentTime;
private String appointmentStatus;
private String appointmentType; private String appointmentType;
private String appointmentStatus;
private String orderStatus;
private String serviceStatus;
private String createTime; private String createTime;
} }
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java
...@@ -41,8 +41,9 @@ public class OrderInfo { ...@@ -41,8 +41,9 @@ public class OrderInfo {
private String orgTeamId; private String orgTeamId;
private Integer priority; private Integer priority;
private String tags; private String tags;
private String appointmentStatus;
private String appointmentMethod; private String appointmentMethod;
private String appointmentStatus;
private String dispatcher;
private String orderStatus; private String orderStatus;
private String serviceStatus; private String serviceStatus;
private String engineerCode; private String engineerCode;
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
...@@ -132,8 +132,11 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -132,8 +132,11 @@ 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.setExpectTimeDesc(o.getExpectTimeDesc());
record.setAppointmentStatus(o.getAppointmentStatus());
record.setAppointmentType(o.getAppointmentMethod()); record.setAppointmentType(o.getAppointmentMethod());
record.setAppointmentStatus(o.getAppointmentStatus());
record.setOrderStatus(o.getOrderStatus());
record.setServiceStatus(o.getServiceStatus());
record.setDispatcher(o.getDispatcher());
record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime())); record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
content.add(record); content.add(record);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!