油量计算

廖磊
1 parent 73a56793
Showing 5 changed files with 101 additions and 46 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -27,6 +27,29 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " xlbm like %?4% and nbbm like %?5% ",nativeQuery=true)
 	List<Ylb> obtainYlbefore(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	/**
+	 * 获取当天日期前的最大的日期中最大进出顺序的数据
+	 * 
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
+			+ " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
+			+ " select max(t.rq) as rq ,t.nbbm   from bsth_c_ylb t "
+			+ " where to_days(t.rq)< to_days(?1) "
+			+ " and t.ssgsdm like %?2% and t.fgsdm like %?3%  "
+			+ " and t.xlbm like %?4%  and t.nbbm like %?5% group by nbbm ) a "
+			+ " left join bsth_c_ylb b on  a.rq=b.rq and a.nbbm=b.nbbm "
+			+ " where  b.ssgsdm like %?2% and  b.fgsdm like %?3%  and  "
+			+ " b.xlbm like %?4%  and  b.nbbm like %?5%  group by b.rq,b.nbbm) c"
+			+ " left join bsth_c_ylb d on c.rq=d.rq and c.nbbm=d.nbbm and c.jcsx=d.jcsx "
+			+ " where  d.ssgsdm like %?2% and  d.fgsdm like %?3%  and  d.xlbm like %?4% "
+			+ " and  d.nbbm like %?5%  group by d.nbbm) x left join  "
+			+ " bsth_c_ylb y on x.id=y.id where  y.ssgsdm like %?2% and y.fgsdm like %?3%  "
+			+ " and y.xlbm like %?4%  and y.nbbm like %?5%",nativeQuery=true)
+	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	
 	/**
 	 * 当天YLB信息
 	 * @param rq
@@ -164,8 +164,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
-	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
@@ -276,17 +276,22 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		// TODO Auto-generated method stub
 		String rq=map.get("rq").toString();
 		String nbbm=map.get("nbbh").toString();
+		String gsdm=map.get("gsdm_like").toString();
+		
+		String fgsdm=map.get("fgsdm_like").toString();
 		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
 				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
 				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
 				   " left  join ("
 				   + " select * from bsth_c_ylxxb b "
-				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
+				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
+				   		+ " and gsdm = '"+gsdm+"') b " +
 				  " on a.nbbm=b.nbbm "
 				  + "left join (select nbbm,group_concat(jsy) as jsy  "
-				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) "
+				  		+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"'  group by nbbm "+
 				   " ) c on a.nbbm=c.nbbm  "
-				   + "where  a.nbbm like '%"+nbbm+"%'";
+				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'";
 		List<Ylxxb> yList= jdbcTemplate.query(sql,
 				 new RowMapper<Ylxxb>(){
@@ -102,7 +102,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
+//			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
+			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, "", "", "", "");
 			List<Cyl> clyList=cylRepository.obtainCyl("","");
 			//从排班表中计算出行驶的总里程
 			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
@@ -240,7 +241,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
+//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
+			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
@@ -325,7 +327,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
 					t.setZlc(map.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+							: Double.parseDouble(map.get("totalKilometers").toString()));
 					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
@@ -451,13 +453,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
 								//把进场油量的小数和整数分别取出
 //								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
-								long l=Math.round(nextJzyl);
-								double ylxs=l*100/100;
-//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-								t.setYh(yh);
-								t.setJzyl(ylxs);
-								nextJzyl=ylxs;
+								if(zlc>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+								
+								
+								
 							} else {
 								t.setCzyl(nextJzyl);
 								Double yh=0.0;
@@ -465,16 +475,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
 								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
-								long l=Math.round(nextJzyl);
-								double ylxs=l*100/100;
-//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-								t.setYh(yh);
-								t.setJzyl(ylxs);
-								nextJzyl= ylxs;
+								if(zlc>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
 							}
 							repository.save(t);
-							for (int z = 0; z < cylList.size(); z++) {
+							/*for (int z = 0; z < cylList.size(); z++) {
 								Cyl cyl = cylList.get(z);
 								if (t.getNbbm().equals(cyl.getNbbm())) {
 									cyl.setCyl(t.getJzyl());
@@ -482,7 +497,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									break;
 								}
 								cylRepository.save(cyl);
-							}
+							}*/
 						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
@@ -687,7 +702,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			if(map.get("nbbm_eq")!=null){
 				nbbm=map.get("nbbm_eq").toString();
 			}
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+//			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
 			List<Cyl> cylList=cylRepository.obtainCyl(nbbm, gsbm);
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
@@ -751,11 +767,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setYh(0.0);
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						repository.save(t);
-						if(null!=cyl){
+						/*if(null!=cyl){
 							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
 							cyl.setUpdatetime(y1.getYyrq());
 							cylRepository.save(cyl);
-						}
+						}*/
 					}
 				}
 			}
@@ -1048,7 +1064,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			t.setRylx(rylx);
 			t.setId(jsonObject.getInteger("id"));*/
 			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
-			for (int z = 0; z < cylList.size(); z++) {
+			/*for (int z = 0; z < cylList.size(); z++) {
 				Cyl cyl = cylList.get(z);
 				if (nbbm.equals(cyl.getNbbm())) {
 					cyl.setCyl(jzyl);
@@ -1056,7 +1072,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					break;
 				}
 				cylRepository.save(cyl);
-			}
+			}*/
 		}
 //		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
@@ -1139,13 +1155,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 						}
 						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
-						long l=Math.round(nextJzyl);
-						double ylxs=l*100/100;
-//						nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-						yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-						t.setJzyl(ylxs);
-						t.setYh(yh);
-						nextJzyl=ylxs;
+						if(zlc>0){
+							long l=Math.round(nextJzyl);
+							double ylxs=l*100/100;
+//							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+							yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+							t.setYh(yh);
+							t.setJzyl(ylxs);
+							nextJzyl=ylxs;
+						}else{
+							t.setYh(yh);
+							t.setJzyl(nextJzyl);
+						}
 					} else {
 						if(t.getId()==id){
 							t.setSh(sh);
@@ -1157,16 +1178,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 							}
 							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
-							long l=Math.round(nextJzyl);
-							double ylxs=l*100/100;
-//							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-							yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-							t.setJzyl(ylxs);
-							t.setYh(yh);
-							nextJzyl=ylxs;
+							if(zlc>0){
+								long l=Math.round(nextJzyl);
+								double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl=ylxs;
+							}else{
+								t.setYh(yh);
+								t.setJzyl(nextJzyl);
+							}
 					}
 					repository.save(t);
-					for (int z = 0; z < cylList.size(); z++) {
+					/*for (int z = 0; z < cylList.size(); z++) {
 						Cyl cyl = cylList.get(z);
 						if (t.getNbbm().equals(cyl.getNbbm())) {
 							cyl.setCyl(t.getJzyl());
@@ -1174,7 +1200,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							break;
 						}
 						cylRepository.save(cyl);
-					}
+					}*/
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
@@ -2702,12 +2702,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
 //    	  System.out.println("shijian1:"+new Date());
-        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm);
+        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
 //        System.out.println("shijian2:"+new Date());
         //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
 //        System.out.println("shijian3:"+new Date());
         for (int x = 0; x < yesterdayDataList.size(); x++) {
+        	
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();