Merge branch 'dev_mp2jpa0810' into 'develop'

修改

See merge request !334

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

@@ -19,5 +19,5 @@ public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long>, JpaS
     List<OrderInfoEntity> findAllByOrderIdIn(List<String> orderIds);
     List<OrderInfoEntity> findAllByDtAndOrderIdIn(LocalDate dt, List<String> orderIds);
     List<OrderInfoEntity> findByEngineerCodeAndDtAndAppointmentStatusIn(String engineerCode, LocalDate dt, List<String> appointmentStatus);
-    List<OrderInfoEntity> findByDtAndTeamIdAndAppointmentStatusIn(LocalDate dt, String teamId, List<String> appointmentStatus);
+    List<OrderInfoEntity> findByDtAndOrgTeamIdAndAppointmentStatusIn(LocalDate dt, String orgTeamId, List<String> appointmentStatus);
 }

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

@@ -91,7 +91,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 			team.setLevel("team");
 
 			// 获取改team订单列表
-			List<OrderInfoEntity> orders = orderInfoDao.findByDtAndTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of("PRE", "CONFIRM"));
+			List<OrderInfoEntity> orders = orderInfoDao.findByDtAndOrgTeamIdAndAppointmentStatusIn(date, t.getTeamId(), List.of("PRE", "CONFIRM"));
 			team.setOrder(this.getTeamOrderSum(orders, skillMapping));
 
 			// 技术员指派单列表