fix:排班结果工程师详情修改

project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java

@@ -46,11 +46,14 @@ public class ScheduleController {
     }
 
     @GetMapping("/schedule/engineer/overview")
-	public Result<?> getScheduleEngineerOverview(@RequestParam String date, @RequestParam String engineerCode) {
+    public Result<?> getScheduleEngineerOverview(@RequestParam String date,
+                                                 @RequestParam String engineerCode,
+                                                 @RequestParam(required = false) String sort,
+                                                 @RequestParam(required = false) String sortType) {
         Result<?> res = null;
         LocalDate localDate = TimeUtils.IsoDate2LocalDate(date);
         try {
-			res = scheduleService.getScheduleEngineerOverview(localDate, engineerCode);
+            res = scheduleService.getScheduleEngineerOverview(localDate, engineerCode, sort, sortType);
         } catch (BusinessException e) {
             return Result.failed(e.getMessage());
         }

project-order/src/main/java/com/dituhui/pea/order/dao/OrderInfoDao.java

 package com.dituhui.pea.order.dao;
 
 import com.dituhui.pea.order.entity.OrderInfoEntity;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -26,7 +27,7 @@ public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long>, JpaS
 
     List<OrderInfoEntity> findAllByDtAndOrderIdIn(LocalDate dt, List<String> orderIds);
 
-    List<OrderInfoEntity> findByEngineerCodeAndDtAndAppointmentStatusIn(String engineerCode, LocalDate dt, List<String> appointmentStatus);
+    List<OrderInfoEntity> findByEngineerCodeAndDtAndAppointmentStatusIn(String engineerCode, LocalDate dt, List<String> appointmentStatus, Sort sort);
 
     List<OrderInfoEntity> findByDtAndOrgTeamIdAndAppointmentStatusIn(LocalDate dt, String orgTeamId, List<String> appointmentStatus);
 

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

@@ -11,5 +11,5 @@ public interface ScheduleService {
 
 	Result<?> getScheduleOverview(long page, long size, LocalDate date, String levelType, List<String> levelIds);
 
-	Result<?> getScheduleEngineerOverview(LocalDate date, String engineerCode);
+	Result<?> getScheduleEngineerOverview(LocalDate date, String engineerCode, String sortColumn, String sortType);
 }

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

@@ -89,7 +89,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 
 	private List<OrderInfoEntity> selectEngineerOrders(String engineerCode, LocalDate dt){
 		List<OrderInfoEntity> orders = orderInfoDao.findByEngineerCodeAndDtAndAppointmentStatusIn(
-				engineerCode, dt, List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
+				engineerCode, dt, List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()), null);
 		return orders.stream().filter(o -> !o.getOrderStatus().equals("CANCEL")).collect(Collectors.toList());
 	}
 

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

@@ -111,7 +111,7 @@ public class OrderAssignImpl implements OrderAssign {
 
             // 获取已技术员已指派订单列表
             List<OrderInfoEntity> orderAppointments = orderInfoDao.findByEngineerCodeAndDtAndAppointmentStatusIn(
-                    engineer.getEngineerCode(), order.getDt(), List.of(OrderFlowEnum.CONFIRM.name()));
+                    engineer.getEngineerCode(), order.getDt(), List.of(OrderFlowEnum.CONFIRM.name()), null);
 
             // 获取订单tips
             HashMap<String, List<LabelValueDTO>> orderTips = new HashMap<>();

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

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
@@ -165,7 +167,7 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
-    public Result<?> getScheduleEngineerOverview(LocalDate date, String engineerCode) throws BusinessException {
+    public Result<?> getScheduleEngineerOverview(LocalDate date, String engineerCode, String sortColumn, String sortType) throws BusinessException {
         // 获取技术员已排班概况
 
         EngineerInfoEntity engineer = engineerInfoDao.getByEngineerCode(engineerCode);
@@ -175,8 +177,16 @@ public class ScheduleServiceImpl implements ScheduleService {
         EngineerBusinessEntity engineerBusinessEntity = engineerBusinessDao.getByEngineerCode(engineerCode);
         List<LabelValueDTO> emptyTips = new ArrayList<>();
 
+        if (!"orderId".equals(sortColumn)) {
+            sortColumn = "actualStartTime";
+        }
+        if (!"desc".equals(sortType)) {
+            sortType = "asc";
+        }
+        Sort sort = Sort.by(Sort.Direction.valueOf(sortType.toUpperCase()), sortColumn);
+
         List<OrderInfoEntity> orderAppointments = orderInfoDao.findByEngineerCodeAndDtAndAppointmentStatusIn(
-                engineerCode, date, List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()));
+                engineerCode, date, List.of(OrderFlowEnum.PRE.name(), OrderFlowEnum.CONFIRM.name()), sort);
         List<TimeLineDTO> timelines = new ArrayList<>();
         int sumDistance = 0;
         int sumElapsed = 0;
@@ -221,13 +231,13 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
         dynamics.setVehicleName(VehicleEnum.getNameByValue(engineer.getVehicle()));
 
-        List<String> orderIds = orderAppointments.stream().map(OrderInfoEntity::getOrderId).collect(Collectors.toList());
-        List<OrderInfoEntity> orderRequests = new ArrayList<>();
-        if (orderIds != null && !orderIds.isEmpty()) {
-            orderRequests = orderInfoDao.findAllByDtAndOrderIdIn(date, orderIds);
-        }
+//        List<String> orderIds = orderAppointments.stream().map(OrderInfoEntity::getOrderId).collect(Collectors.toList());
+//        List<OrderInfoEntity> orderRequests = new ArrayList<>();
+//        if (orderIds != null && !orderIds.isEmpty()) {
+//            orderRequests = orderInfoDao.findAllByDtAndOrderIdIn(date, orderIds);
+//        }
         List<ScheduleEngineerOverviewResp.Order> orders = new ArrayList<>();
-        for (OrderInfoEntity o : orderRequests) {
+        for (OrderInfoEntity o : orderAppointments) {
             ScheduleEngineerOverviewResp.Order item = new ScheduleEngineerOverviewResp.Order();
             item.setOrderId(o.getOrderId());
             item.setLocation(String.format("%s,%s", o.getX(), o.getY()));