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

project-dispatch/src/main/java/com/dituhui/pea/dispatch/dao/OrderInfoRepository.java

@@ -19,4 +19,6 @@ public interface OrderInfoRepository extends CrudRepository<OrderInfo, Long> {
     
     List<OrderInfo> findByOrgTeamIdAndDt(String teamId, LocalDate dt);
     
+    List<OrderInfo> findByOrgGroupIdAndDt(String groupId, LocalDate dt);
+
 }

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/BatchServiceImpl.java

@@ -86,7 +86,7 @@ public class BatchServiceImpl implements BatchService {
 
         // FIXME 因为系统暂时没有订单，每次固定拉取2023-08-13号订单数据生成新订单
 		LocalDate localDt = LocalDate.parse(batchDay, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-		List<OrderInfo> orders = orderInfoRepository.findByOrgTeamIdAndDt(groupId, localDt);
+		List<OrderInfo> orders = orderInfoRepository.findByOrgGroupIdAndDt(groupId, localDt);
 		if (CollectionUtils.isEmpty(orders)) {
 			String tempDay = "2023-08-13";
 			String createOrder = "INSERT INTO order_info (\r\n" + "  order_id,\r\n" + "  dt,\r\n" + "  sub_id,\r\n"
@@ -102,7 +102,7 @@ public class BatchServiceImpl implements BatchService {
 					+ "  engineer_phone,\r\n" + "  engineer_code_sub,\r\n" + "  plan_start_time,\r\n"
 					+ "  plan_end_time,\r\n" + "  arrive_elapsed,\r\n" + "  arrive_distance,\r\n"
 					+ "  actual_start_time,\r\n" + "  actual_end_time,\r\n" + "  description,\r\n" + "  extra_info,\r\n"
-					+ "  create_time,\r\n" + "  update_time\r\n" + ") \r\n" + "SELECT \r\n" + "  order_id,\r\n" + "  '"
+					+ "  create_time,\r\n" + "  update_time\r\n" + ") \r\n" + "SELECT \r\n" + " CONCAT(order_id,'" + batchDay + "') order_id,\r\n" + "  '"
 					+ batchDay + "',\r\n" + "  sub_id,\r\n" + "  NAME,\r\n" + "  phone,\r\n" + "  province,\r\n"
 					+ "  city,\r\n" + "  county,\r\n" + "  address,\r\n" + "  X,\r\n" + "  Y,\r\n" + "  bean_brand,\r\n"
 					+ "  brand,\r\n" + "  TYPE,\r\n" + "  skill,\r\n" + "  take_time,\r\n" + "  is_workshop,\r\n"

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

@@ -14,8 +14,8 @@ public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long>, JpaS
     List<OrderInfoEntity> findByOrderId(String orderId);
     List<OrderInfoEntity> findByDtAndEngineerCodeIn(LocalDate date, List<String> engineerCodes);
     List<OrderInfoEntity> findByDtAndEngineerCode(LocalDate date, String engineerCode);
-    @Query("SELECT o.orderId, s.skillCategory as skillCaption FROM OrderInfoEntity o  JOIN SkillInfoEntity s on o.brand=s.brand and o.type=s.type and o.skill=s.skill WHERE o.orderId = :orderId")
-    OrderSkillProjection getOrderSkillCaptionByOrderId(String orderId);
+    @Query("SELECT o.orderId, s.skillCategory as skillCaption FROM OrderInfoEntity o  JOIN SkillInfoEntity s on o.brand=s.brand and o.type=s.type and o.skill=s.skill WHERE o.orderId = :orderId and o.dt = :dt")
+    OrderSkillProjection getOrderSkillCaptionByOrderIdAndDt(String orderId, LocalDate dt);
     List<OrderInfoEntity> findAllByOrderIdIn(List<String> orderIds);
     List<OrderInfoEntity> findAllByDtAndOrderIdIn(LocalDate dt, List<String> orderIds);
     List<OrderInfoEntity> findByEngineerCodeAndDtAndAppointmentStatusIn(String engineerCode, LocalDate dt, List<String> appointmentStatus);

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

@@ -53,7 +53,8 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             log.info("根据多条件，查询返回符合条件的技术员列表：{}", engineerCodes);
         }
 
-        List<OrderInfoEntity> orders = orderInfoDao.findByDtAndEngineerCodeIn(LocalDate.parse(reqDTO.getDate()), engineerCodes);
+        LocalDate localDate = LocalDate.parse(reqDTO.getDate());
+        List<OrderInfoEntity> orders = orderInfoDao.findByDtAndEngineerCodeIn(localDate, engineerCodes);
         HashMap<String, List<EngineersGanttDTO.Slot>> mapEngineers = new HashMap<>();
         for (OrderInfoEntity order : orders) {
             // 服务工单本体
@@ -71,7 +72,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
                 slot.setEtime(getHourMinute(order.getExpectTimeEnd()));
             }
             slot.setTooltip(getOrderTips(order));
-            OrderSkillProjection orderSkill = orderInfoDao.getOrderSkillCaptionByOrderId(order.getOrderId());
+            OrderSkillProjection orderSkill = orderInfoDao.getOrderSkillCaptionByOrderIdAndDt(order.getOrderId(), localDate);
             if (orderSkill != null) {
                 slot.setText(orderSkill.getSkillCaption());
             }