接口新增takeTime-耗时

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java

@@ -15,6 +15,7 @@ public class OrderServiceList {
 	private String x;
 	private String x;
 	private String y;
 	private String y;
 	private Integer priority;
 	private Integer priority;
+	private Integer takeTime;
 	private String expectTimeBegin;
 	private String expectTimeBegin;
 	private String expectTimeEnd;
 	private String expectTimeEnd;
 	private String expectTimeDesc;
 	private String expectTimeDesc;

project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java

@@ -22,6 +22,8 @@ public class OrderInfo {
 	private String brand;
 	private String brand;
 	private String type;
 	private String type;
 	private String skill;
 	private String skill;
+	private Integer takeTime;
+	private Integer isWorkshop;
 	private String applyNote;
 	private String applyNote;
 	private String faultDescribe;
 	private String faultDescribe;
 	private Timestamp expectTimeBegin;
 	private Timestamp expectTimeBegin;

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -113,6 +113,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			record.setType(o.getType());
 			record.setType(o.getType());
 			record.setBrand(o.getBrand());
 			record.setBrand(o.getBrand());
 			record.setSkill(o.getSkill());
 			record.setSkill(o.getSkill());
+			record.setTakeTime(o.getTakeTime());
 			record.setFaultDescribe(o.getFaultDescribe());
 			record.setFaultDescribe(o.getFaultDescribe());
 			record.setName(o.getName());
 			record.setName(o.getName());
 			record.setPhone(o.getPhone());
 			record.setPhone(o.getPhone());