Merge branch 'dev_mp2jpa0810' into 'develop'

修改

See merge request !336

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

@@ -241,6 +241,7 @@ public class DispatchServiceImpl implements DispatchService {
 		return Result.success(res);
 	}
 
+	@Transactional
 	@Override
 	public Result<?> dispatchOrderConfirm(String engineerCode, String date, List<String> orderIds) throws BusinessException {
 		// 派工台确认派单
@@ -278,6 +279,7 @@ public class DispatchServiceImpl implements DispatchService {
 			update.set(root.get("planEndTime"), planEndTime);
 			update.set(root.get("appointmentStatus"), "CONFIRM");
 			update.set(root.get("appointmentMethod"), "MANUAL");
+			update.set(root.get("engineerCode"), engineerCode);
 			update.where(
 					criteriaBuilder.equal(root.get("orderId"), orderId),
 					criteriaBuilder.equal(root.get("dt"), localDate)