Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/DispatchController.java

@@ -2,6 +2,7 @@ package com.alibaba.cloud.integration.order.controller;
 
 
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.dto.DispatchOrderConfirmReqDTO;
 import com.alibaba.cloud.integration.order.service.DispatchService;
 import com.alibaba.cloud.integration.order.service.DispatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -41,11 +42,11 @@ public class DispatchController {
 	}
 	}
 
 
 	@PostMapping("/dispatch/order/confirm")
 	@PostMapping("/dispatch/order/confirm")
-	public Result<?> dispatchOrderConfirm(@RequestBody String engineerCode, @RequestBody String orderIds) {
+	public Result<?> dispatchOrderConfirm(@RequestBody DispatchOrderConfirmReqDTO req) {
 		// 派工台确认派单
 		// 派工台确认派单
 		Result<?> res = null;
 		Result<?> res = null;
 		try {
 		try {
-			res = dispatchService.dispatchOrderConfirm(engineerCode, orderIds);
+			res = dispatchService.dispatchOrderConfirm(req.getEngineerCode(), req.getOrderIds());
 		}catch (BusinessException e){
 		}catch (BusinessException e){
 			Result.failed(e.getMessage());
 			Result.failed(e.getMessage());
 		}
 		}

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/DispatchOrderConfirmReqDTO.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DispatchOrderConfirmReqDTO {
+	private String engineerCode;
+	private List<String> orderIds;
+}

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

 package com.alibaba.cloud.integration.order.entity;
 package com.alibaba.cloud.integration.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
+
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 
 
 @Data
 @Data
@@ -14,9 +15,11 @@ public class OrderAppointment {
 	private String engineerPhone;
 	private String engineerPhone;
 	private String engineerAge;
 	private String engineerAge;
 	private String isWorkshop;
 	private String isWorkshop;
-	private Timestamp expectTime;
+	private Timestamp expectStartTime;
+	private Timestamp expectEndTime;
 	private Timestamp actualTime;
 	private Timestamp actualTime;
-	private Timestamp startTime;
+	private Timestamp actualStartTime;
+	private Timestamp actualEndTime;
 	private Timestamp endTime;
 	private Timestamp endTime;
 	private String pre_status;
 	private String pre_status;
 	private String status;
 	private String status;

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

@@ -10,5 +10,5 @@ public interface DispatchService {
 
 
 	Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date);
 	Result<?> getDispatchEngineerOrderList(String levelType, List<String> levelIds, String date);
 
 
-	Result<?> dispatchOrderConfirm(String engineerCode, String orderIds);
+	Result<?> dispatchOrderConfirm(String engineerCode, List<String> orderIds);
 }
 }

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

@@ -190,7 +190,8 @@ public class DispatchServiceImpl implements DispatchService {
 	}
 	}
 
 
 	@Override
 	@Override
-	public Result<?> dispatchOrderConfirm(String engineerCode, String orderIds) {
+	public Result<?> dispatchOrderConfirm(String engineerCode, List<String> orderIds) {
+		// 派工台确认派单
 		return null;
 		return null;
 	}
 	}
 
 
@@ -225,11 +226,11 @@ public class DispatchServiceImpl implements DispatchService {
 
 
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
 		lqw.in(OrderAppointment::getEngineerCode, engineerCodes);
-		lqw.ge(OrderAppointment::getExpectTime, this.getTimestampFromDate(date, "00:00:00"));
-		lqw.le(OrderAppointment::getExpectTime, this.getTimestampFromDate(date, "23:59:59"));
+		lqw.ge(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "00:00:00"));
+		lqw.le(OrderAppointment::getExpectStartTime, this.getTimestampFromDate(date, "23:59:59"));
 
 
 		lqw.orderByAsc(OrderAppointment::getEngineerCode);
 		lqw.orderByAsc(OrderAppointment::getEngineerCode);
-		lqw.orderByAsc(OrderAppointment::getExpectTime);
+		lqw.orderByAsc(OrderAppointment::getExpectStartTime);
 
 
 		List<OrderAppointment> records = orderAppointmentMPDao.selectList(lqw);
 		List<OrderAppointment> records = orderAppointmentMPDao.selectList(lqw);
 		return records.stream().collect(Collectors.groupingBy(OrderAppointment::getEngineerCode));
 		return records.stream().collect(Collectors.groupingBy(OrderAppointment::getEngineerCode));

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

@@ -80,8 +80,8 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		// 获取指派单列表
 		// 获取指派单列表
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrderAppointment> lqw = new LambdaQueryWrapper<>();
 		lqw.eq(OrderAppointment::getEngineerCode, engineerCode);
 		lqw.eq(OrderAppointment::getEngineerCode, engineerCode);
-		lqw.ge(OrderAppointment::getExpectTime, date + " 00:00:00");
-		lqw.le(OrderAppointment::getExpectTime, date + " 23:59:59");
+		lqw.ge(OrderAppointment::getExpectStartTime, date + " 00:00:00");
+		lqw.le(OrderAppointment::getExpectStartTime, date + " 23:59:59");
 		return orderAppointmentMPDao.selectList(lqw);
 		return orderAppointmentMPDao.selectList(lqw);
 	}
 	}
 
 
@@ -181,7 +181,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 			index += 1;
 			index += 1;
 			EnginnerTimelineResp.DynamicItem item = new EnginnerTimelineResp.DynamicItem();
 			EnginnerTimelineResp.DynamicItem item = new EnginnerTimelineResp.DynamicItem();
 			item.setTitle(String.format("第%d单出发", index));
 			item.setTitle(String.format("第%d单出发", index));
-			item.setTime(this.Timestamp2Datetime(o.getExpectTime()));
+			item.setTime(this.Timestamp2Datetime(o.getExpectStartTime()));
 			item.setStatus(0);
 			item.setStatus(0);
 			item.setText(String.format("%d", index));
 			item.setText(String.format("%d", index));
 			item.setLocation(locations.get(o.getOrderId()));
 			item.setLocation(locations.get(o.getOrderId()));

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

@@ -132,13 +132,13 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 			// 获取title
 			// 获取title
 			String title = engineerName;
 			String title = engineerName;
 			if (!lastSubOrderId.equals(subOrderId)) {
 			if (!lastSubOrderId.equals(subOrderId)) {
-				title = String.format("%s_%s", engineerName, this.Timestamp2Datetime(o.getExpectTime(), "yyyyMMdd"));
+				title = String.format("%s_%s", engineerName, this.Timestamp2Datetime(o.getExpectStartTime(), "yyyyMMdd"));
 			}
 			}
 
 
 			OrderAppointmentListResp.OrderAppointment item = new OrderAppointmentListResp.OrderAppointment();
 			OrderAppointmentListResp.OrderAppointment item = new OrderAppointmentListResp.OrderAppointment();
 			item.setTitle(title);
 			item.setTitle(title);
 			item.setEngineerCode(o.getEngineerCode());
 			item.setEngineerCode(o.getEngineerCode());
-			item.setExpectTime(o.getExpectTime().toString());
+			item.setExpectTime(o.getExpectStartTime().toString());
 			item.setTimelines(this.packOrderTimeline(timelines.get(subOrderId)));
 			item.setTimelines(this.packOrderTimeline(timelines.get(subOrderId)));
 			item.setItems(this.packEngineerItems(eg, es, groups.get(eg.getGroupId()), skills));
 			item.setItems(this.packEngineerItems(eg, es, groups.get(eg.getGroupId()), skills));