Commit 0dd766f0e9625d8dd5285551c1e0d828068d703d

Authored by 廖磊
1 parent 07dcd0f4

路单加入油量

src/main/java/com/bsth/repository/oil/YlbRepository.java
@@ -39,8 +39,8 @@ public interface YlbRepository extends BaseRepository<Ylb, Integer>{ @@ -39,8 +39,8 @@ public interface YlbRepository extends BaseRepository<Ylb, Integer>{
39 39
40 @Transactional 40 @Transactional
41 @Modifying 41 @Modifying
42 - @Query(value="SELECT * FROM bsth_c_ylb where to_days(?1)=to_days(rq) and nbbm =?2 ",nativeQuery=true)  
43 - List<Ylb> queryListYlb(String rq,String nbbm); 42 + @Query(value="SELECT * FROM bsth_c_ylb where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3",nativeQuery=true)
  43 + List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
44 /** 44 /**
45 * 查询当天总的加注量和总里程 45 * 查询当天总的加注量和总里程
46 * @param rq 46 * @param rq
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -3060,7 +3060,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3060,7 +3060,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3060 jzl += y.getJzl(); 3060 jzl += y.getJzl();
3061 } 3061 }
3062 3062
3063 - List<Ylb> listYlb=ylbRepository.queryListYlb( fcrq,s.getClZbh()); 3063 + List<Ylb> listYlb=ylbRepository.queryListYlb( fcrq,s.getClZbh(),s.getjGh());
3064 Double ccyl=0.0; 3064 Double ccyl=0.0;
3065 Double jcyl=0.0; 3065 Double jcyl=0.0;
3066 Double yh=0.0; 3066 Double yh=0.0;