Update ContractRepository.java

src/main/java/common/repository/ContractRepository.java

@@ -98,21 +98,22 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
     @Query(value = "select contract_code,my_body_code,sale,platform from contract where contract_code in ?1",nativeQuery = true)
     List<Object[]> findByContractCode(List<String> codesList);
 
-    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?4  and platform=?3",nativeQuery = true)
+//    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?4  and platform=?3 and status!='del' ",nativeQuery = true)
+    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2   and platform=?3 and status!='del' ",nativeQuery = true)
     List<Contract> findShareContranctByDate3(String startDate, String endDate, String platform,String endCreate);
 
-    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?5 and platform=?3   and my_body_code = ?4",nativeQuery = true)
+    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2  and platform=?3   and my_body_code = ?4 and status!='del' ",nativeQuery = true)
     List<Contract> findShareContranctByDate2(String startDate, String endDate, String platform, String bodyCode,String endCreate);
 
-    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?5 and platform=?3 and (my_body_name like %?4% or customer_body like %?4% or contract_code like %?4%)",nativeQuery = true)
+    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2  and platform=?3 and (my_body_name like %?4% or customer_body like %?4% or contract_code like %?4%)  and status!='del' ",nativeQuery = true)
     List<Contract> findShareContranctByDateSerche(String startDate, String endDate, String platform, String serchName,String endCreate);
 
-    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?6 and platform=?3   and my_body_code = ?4  and (my_body_name like %?5% or customer_body like %?5% or contract_code like %?5%)",nativeQuery = true)
+    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2  and platform=?3   and my_body_code = ?4  and (my_body_name like %?5% or customer_body like %?5% or contract_code like %?5%)  and status!='del' ",nativeQuery = true)
     List<Contract> findShareContranctByDate1(String startDate, String endDate, String platform, String bodyCode, String serchName,String endCreate);
 
-    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?6 and platform=?3 and (my_body_name like %?4% or customer_body like %?4% or contract_code like %?5%) and my_body_code in ?5",nativeQuery = true)
+    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2  and platform=?3 and (my_body_name like %?4% or customer_body like %?4% or contract_code like %?5%) and my_body_code in ?5 and status!='del' ",nativeQuery = true)
     List<Contract> findShareContranctByDateSercheFinace(String startDate, String endDate, String platform, String serchName, List<String> financeBodies,String endCreate);
 
-    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2 and end_date >= ?1 and create_time <= ?5 and platform=?3 and my_body_code in ?4",nativeQuery = true)
+    @Query(value="select * from contract where start_date >= ?1 and start_date <=?2  and platform=?3 and my_body_code in ?4 and status!='del' ",nativeQuery = true)
     List<Contract> findShareContranctByDateFinace(String startDate, String endDate, String platform, List<String> financeBodies,String endCreate);
 }