接口变更

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

@@ -11,8 +11,8 @@ public class ScheduleEngineerOverviewResp {
 	private String startTime;
 	private String endTime;
 	private List<Dynamic> dynamics;
-	private List<Timeline> timelines;
-	private List<Order> orders;
+	private List<TimeLineDTO> orders;
+	private List<Order> orderDetails;
 
 	@Data
 	public static class Dynamic {
@@ -21,13 +21,6 @@ public class ScheduleEngineerOverviewResp {
 	}
 
 	@Data
-	public static class Timeline {
-		private String startTime;
-		private String endTime;
-		private String type;
-	}
-
-	@Data
 	public static class Order {
 		private String orderId;
 		private String location;

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

@@ -7,8 +7,10 @@ import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.common.TimeUtils;
 import com.dituhui.pea.order.dao.*;
+import com.dituhui.pea.order.dto.LabelValueDTO;
 import com.dituhui.pea.order.dto.ScheduleEngineerOverviewResp;
 import com.dituhui.pea.order.dto.ScheduleOverviewResp;
+import com.dituhui.pea.order.dto.TimeLineDTO;
 import com.dituhui.pea.order.entity.*;
 import com.dituhui.pea.order.service.ScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -125,19 +127,22 @@ public class ScheduleServiceImpl implements ScheduleService {
 
 	@Override
 	public Result<?> getScheduleEngineerOverview(String date, String engineerCode) throws BusinessException {
-		EngineerInfo engineer = this.queryEngineerInfo(engineerCode);
+		EngineerInfo engineer = engineerInfoMPDao.getByEngineerCode(engineerCode);
 		if (engineer == null) {
 			throw new BusinessException("分销员不存在");
 		}
 
+		List<LabelValueDTO> emptyTips = new ArrayList<>();
 		List<OrderAppointment> orderAppointments = this.queryOrderAppointmentsByEngineerCode(engineerCode, date);
-
-		List<ScheduleEngineerOverviewResp.Timeline> timelines = new ArrayList<>();
+		List<TimeLineDTO> timelines = new ArrayList<>();
 		for (OrderAppointment o : orderAppointments) {
-			ScheduleEngineerOverviewResp.Timeline item = new ScheduleEngineerOverviewResp.Timeline();
-			item.setStartTime(TimeUtils.timestamp2DateTime(o.getExpectStartTime(), "hh:mm"));
-			item.setEndTime(TimeUtils.timestamp2DateTime(o.getExpectEndTime(), "hh:mm"));
-			item.setType(o.getStatus());
+			TimeLineDTO item = new TimeLineDTO();
+			item.setOrderId(o.getOrderId());
+			item.setPreStatus(o.getPreStatus());
+			item.setAppointmentStatus(o.getStatus());
+			item.setStartTime(TimeUtils.IsoTimestamp2DateTime(o.getExpectStartTime()));
+			item.setEndTime(TimeUtils.IsoTimestamp2DateTime(o.getExpectEndTime()));
+			item.setTips(emptyTips);
 			timelines.add(item);
 		}
 
@@ -192,8 +197,8 @@ public class ScheduleServiceImpl implements ScheduleService {
 		res.setStartTime("08:00");  // TODO
 		res.setEndTime("18:00");
 		res.setDynamics(dynamics);
-		res.setTimelines(timelines);
-		res.setOrders(orders);
+		res.setOrders(timelines);
+		res.setOrderDetails(orders);
 
 		return Result.success(res);
 	}