Commit 11f520fd94661247ff72246e67f8a073e2a2c0c0

Authored by 徐烜
1 parent f347a72b

PSM-13

src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
@@ -24,8 +24,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanI @@ -24,8 +24,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanI
24 List<SchedulePlanInfo> findByDate(Date date); 24 List<SchedulePlanInfo> findByDate(Date date);
25 25
26 Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate); 26 Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
27 -  
28 - 27 +
29 @Query(value = " select " + 28 @Query(value = " select " +
30 "xl as xlId, " + 29 "xl as xlId, " +
31 "xl_name as xlName, " + 30 "xl_name as xlName, " +
@@ -45,7 +44,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI @@ -45,7 +44,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
45 "where bc_type = 'out' and " + 44 "where bc_type = 'out' and " +
46 "xl = ?1 and " + 45 "xl = ?1 and " +
47 "schedule_date = ?2 " + 46 "schedule_date = ?2 " +
48 - "group by xl_name, schedule_date, lp_name " + 47 + "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
49 "order by xl_name, schedule_date, lp ", nativeQuery = true) 48 "order by xl_name, schedule_date, lp ", nativeQuery = true)
50 List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate); 49 List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
51 50