Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !93

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrderAppointment.java

@@ -13,7 +13,7 @@ public class OrderAppointment {
 	private String engineerCode;
 	private String engineerCode;
 	private String engineerName;
 	private String engineerName;
 	private String engineerPhone;
 	private String engineerPhone;
-	private String engineerAge;
+	private Integer engineerAge;
 	private Integer isWorkshop;
 	private Integer isWorkshop;
 	private Timestamp expectStartTime;
 	private Timestamp expectStartTime;
 	private Timestamp expectEndTime;
 	private Timestamp expectEndTime;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java

@@ -220,8 +220,6 @@ public class DispatchServiceImpl implements DispatchService {
 		OrderRequestScheduler scheduler = new OrderRequestScheduler();
 		OrderRequestScheduler scheduler = new OrderRequestScheduler();
 		List<LineSegment> results = scheduler.scheduler(orders, orderAppointments);
 		List<LineSegment> results = scheduler.scheduler(orders, orderAppointments);
 
 
-		System.out.println(results);
-
 		for (LineSegment r : results) {
 		for (LineSegment r : results) {
 
 
 			String orderId = r.id;
 			String orderId = r.id;
@@ -234,7 +232,7 @@ public class DispatchServiceImpl implements DispatchService {
 			op.setMainSub(1);
 			op.setMainSub(1);
 			op.setEngineerCode(engineerCode);
 			op.setEngineerCode(engineerCode);
 			op.setEngineerName(engineer.getName());
 			op.setEngineerName(engineer.getName());
-			op.setEngineerAge("");
+			op.setEngineerAge(0);
 			op.setEngineerPhone(engineer.getPhone());
 			op.setEngineerPhone(engineer.getPhone());
 			op.setIsWorkshop(0);
 			op.setIsWorkshop(0);
 			op.setExpectStartTime(expectStartTime);
 			op.setExpectStartTime(expectStartTime);