潘钊 / bsth_control · Commits

Commit 46ae344a268fe8f0823f294ceaa65ca81bd5b6d7

Authored by mcy123
1 parent abae18f2

mcy

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @46ae344
@@ -85,6 +85,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI @@ -85,6 +85,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
85 @Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by bcs") 85 @Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by bcs")
86 List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date); 86 List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
87 87
  88 + @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d') order by bcs")
  89 + List<ScheduleRealInfo> queryListWaybill4(String jName,String clZbh,String date,String enddate);
  90 +
88 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2") 91 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
89 List<ScheduleRealInfo> scheduleDaily(String line,String date); 92 List<ScheduleRealInfo> scheduleDaily(String line,String date);
90 93
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @46ae344
@@ -1676,7 +1676,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1676,7 +1676,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1676 @Override 1676 @Override
1677 public Map<String, Object> findKMBC1(String jName, String clZbh, 1677 public Map<String, Object> findKMBC1(String jName, String clZbh,
1678 String date, String enddate) { 1678 String date, String enddate) {
1679 - List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill2(jName, clZbh, date, enddate); 1679 + List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill4(jName, clZbh, date, enddate);
1680 DecimalFormat format = new DecimalFormat("0.00"); 1680 DecimalFormat format = new DecimalFormat("0.00");
1681 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName); 1681 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
1682 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName); 1682 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);