fix: 逻辑删除

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

@@ -2,12 +2,14 @@ package com.dituhui.pea.order.dao;
 
 import com.dituhui.pea.order.entity.EngineerSkillGroupEntity;
 import com.dituhui.pea.order.entity.SkillGroupEntity;
+import org.hibernate.annotations.Where;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Where(clause = " status = 1")
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
     List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
 

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

@@ -74,7 +74,7 @@ public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long>, JpaS
      * @return 满足条件的工单信息
      */
     @Query(value = "SELECT oi.* FROM skill_info si LEFT JOIN order_info oi  ON oi.brand = si.brand  AND oi.type = si.type  AND  oi.skill = si.skill " +
-            " WHERE si.skill_group_code = :skillGroupCode  AND oi.expect_time_begin >= :dateTime  AND oi.is_multiple = 0 " +
+            " WHERE si.skill_group_code = :skillGroupCode  AND oi.expect_time_begin >= :dateTime  AND oi.is_multiple = 0 AND si.status = 1 " +
             " AND  (appointment_status = 'INIT' AND order_status != 'CANCELED') AND oi.reason_for_failure IS NULL ", nativeQuery = true)
     List<OrderInfoEntity> getSkillGroupOrder(String skillGroupCode, LocalDateTime dateTime);
 }