油，电对于同人同车同线路不同路的处理

廖磊
1 parent 4d5e7aa3
Showing 8 changed files with 131 additions and 59 deletions
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -73,7 +73,7 @@ public class Dlb {
 	private String fgsname;
-	
+	private String lp;
 	public Integer getId() {
 		return id;
@@ -383,6 +383,15 @@ public class Dlb {
 	public void setUpdatetime(Date updatetime) {
 		this.updatetime = updatetime;
 	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+	
 }
@@ -56,6 +56,7 @@ public class Ylb {
 	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
 	private int jcsx;
+	private String lp;
 	@Transient
 	private String bglyh;
@@ -330,5 +331,14 @@ public class Ylb {
 	public void setUpdatetime(Date updatetime) {
 		this.updatetime = updatetime;
 	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+	
 }
@@ -125,8 +125,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
 			+ " where to_days(?1)=to_days(s.rq) "
-			+ " and s.ssgsdm like %?2% "
-			+ " and s.fgsdm like %?3%"
+			+ " and s.ssgsdm =?2 "
+			+ " and s.fgsdm =?3 "
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
@@ -17,17 +17,17 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where yyrq=?1 and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and gsdm=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where yyrq=?1 and gsdm=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where yyrq=?1 and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
 	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
-			+ "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
+			+ "s.yyrq=?2",nativeQuery=true)
 	List<Ylxxb> queryListYlxxb(String clZbh,String date);
@@ -190,10 +190,10 @@ 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 s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
-	@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 =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
 	@Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
@@ -739,15 +739,29 @@ public class FormsServiceImpl implements FormsService {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
-							newList.add(s);
-							 Set<ChildTaskPlan> cts = s.getcTasks();
-				            if(cts != null && cts.size() > 0){
-				            	newList_.add(s);
-				            }else{
-					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+							if(y.getLp()==null){
+								newList.add(s);
+								 Set<ChildTaskPlan> cts = s.getcTasks();
+					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
+					            }else{
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+						            	newList_.add(s);
+						            }
 					            }
-				            }
+							}else{
+								if(y.getLp().equals(s.getLpName())){
+									newList.add(s);
+									 Set<ChildTaskPlan> cts = s.getcTasks();
+						            if(cts != null && cts.size() > 0){
+						            	newList_.add(s);
+						            }else{
+							            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+							            	newList_.add(s);
+							            }
+						            }
+								}
+							}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -793,8 +807,9 @@ public class FormsServiceImpl implements FormsService {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
-							newList.add(s);
-							 Set<ChildTaskPlan> cts = s.getcTasks();
+							if(y.getLp()==null){
+								newList.add(s);
+								 Set<ChildTaskPlan> cts = s.getcTasks();
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
@@ -802,6 +817,19 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+							}else{
+								if(y.getLp().equals(s.getLpName())){
+									newList.add(s);
+									 Set<ChildTaskPlan> cts = s.getcTasks();
+						            if(cts != null && cts.size() > 0){
+						            	newList_.add(s);
+						            }else{
+							            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+							            	newList_.add(s);
+							            }
+						            }
+								}
+							}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1604,7 +1632,7 @@ public class FormsServiceImpl implements FormsService {
 		 @Override
 			public int compare(Singledata o1, Singledata o2) {
 				// TODO Auto-generated method stub
-				return  o2.getxL().compareTo(o1.getxL());
+				return  (o2.getxL()+o2.getClzbh()).compareTo((o1.getxL()+o1.getClzbh()));
 			}
 	}
 }
@@ -184,6 +184,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+						t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
 						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 						t.setRq(sdf.parse(rq));
 						t.setCreatetime(dNow);
@@ -262,13 +263,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// TODO Auto-generated method stub
 			// 当天YLB信息
 			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
-//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
+
 			// 前一天所有车辆最后进场班次信息
 //			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 =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
@@ -307,11 +311,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					}
 				}
 			}
-			
+
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
-			String ins="";
 			Map<String, Object> ylMap=new HashMap<String, Object>();
+			
+			Map<String, Object> cMap=new HashMap<String, Object>();
 			for (int x = 0; x < listpb.size(); x++) {
 				String type = "add";
 				boolean sfdc = true;
@@ -328,12 +333,25 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						Ylb t1 = ylList.get(k);
 						if (t1.getNbbm().equals(map.get("clZbh").toString())
 								&& t1.getJsy().equals(map.get("jGh").toString())
-								&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-							t = t1;
-							type = "update";
+								&& t1.getXlbm().equals(map.get("xlBm").toString()
+								)) {
+							if(t1.getLp()==null){
+								//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+								if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+									t = t1;
+									type = "update";
+									cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+											map.get("clZbh").toString());
+								}
+							}else{
+								if(t1.getLp().equals(map.get("lpName").toString())){
+									t = t1;
+									type = "update";
+								}
+								
+							}
 						}
 					}
-
 					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
 					if (map.get("seqNumber").toString().equals("1")) {
 						boolean fage = true;
@@ -428,7 +446,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
-					
+					t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
 							 t.setCreatetime(date);
@@ -436,7 +454,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						 }else{
 							 t.setUpdatetime(date);
 						     updateList.add(t); 
-						     ins += t.getId().toString()+",";
 						  }
 					 }
 //					repository.save(t);
@@ -456,7 +473,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 			}
-			
 			if(updateList.size()>0){
 				for (int i = 0; i < updateList.size(); i++) {
 					repository.save(updateList.get(i));
@@ -1437,23 +1453,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								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++) {
-						Cyl cyl = cylList.get(z);
-						if (t.getNbbm().equals(cyl.getNbbm())) {
-							cyl.setCyl(t.getJzyl());
-							cyl.setUpdatetime(t.getRq());
-							break;
-						}
-						cylRepository.save(cyl);
-					}
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
@@ -1547,7 +1552,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String px) {
 		// TODO Auto-generated method stub
 		String sql="SELECT * FROM bsth_c_ylb  "
-				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " where rq ='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
 				+ " and fgsdm like '%"+fgsdm+"%'";
 		if(xlbm.equals("")){
 			sql+= " and xlbm like '%"+xlbm+"%' ";
@@ -2949,21 +2949,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }else{
         	yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList_eq(line, date,gsbm,fgsbm,nbbm);
         }
-        System.out.println("time2:"+new Date());
-	
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
         for (int x = 0; x < yesterdayDataList.size(); x++) {
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
             String xlbm  = yesterdayDataList.get(x).get("xlBm").toString();
+            String lp =yesterdayDataList.get(x).get("lpName").toString();
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
             String company="";
             String bCompany="";
             List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-                if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)
-                		&& scheduleRealInfo.getXlBm().equals(xlbm)){
+                if(scheduleRealInfo.getjGh().equals(jName) 
+                		&& scheduleRealInfo.getClZbh().equals(clZbh)
+                		&& scheduleRealInfo.getXlBm().equals(xlbm)
+                		&& scheduleRealInfo.getLpName().equals(lp)){
                     if (fage) {
                         //根据线路代码获取公司
                         company=scheduleRealInfo.getGsBm();
@@ -2980,7 +2981,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     }
                 }
             }
-
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
             Double ljgl=culateMieageService.culateLjgl(listS);
@@ -3005,6 +3005,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
+
         return yesterdayDataList;
     }
@@ -3550,7 +3551,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                             map.put("fast", "");
                             map.put("slow", "");
                         }
-                        System.out.println(map);
                         listMap.add(map);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -3741,26 +3741,46 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         	 type=0;
         	for (int i = 0; i < listYlb.size(); i++) {
                 Ylb y = listYlb.get(i);
-                ccyl=Arith.add(ccyl, y.getCzyl());
-                jcyl=Arith.add(jcyl, y.getJzyl());
-                yh =Arith.add(yh ,y.getYh());
-                jzl =Arith.add(jzl, y.getJzl());
-                zlc =Arith.add(zlc, y.getZlc());
+                if(y.getLp()==null){
+                	ccyl=Arith.add(ccyl, y.getCzyl());
+                    jcyl=Arith.add(jcyl, y.getJzyl());
+                    yh =Arith.add(yh ,y.getYh());
+                    jzl =Arith.add(jzl, y.getJzl());
+                    zlc =Arith.add(zlc, y.getZlc());
+                }else{
+                	if(y.getLp().equals(s.getLpName())){
+                		ccyl=Arith.add(ccyl, y.getCzyl());
+                        jcyl=Arith.add(jcyl, y.getJzyl());
+                        yh =Arith.add(yh ,y.getYh());
+                        jzl =Arith.add(jzl, y.getJzl());
+                        zlc =Arith.add(zlc, y.getZlc());
+                	}
+                }
+                
             }
         }else{
         	 type=1;
         	for (int i = 0; i < listDlb.size(); i++) {
 				Dlb d=listDlb.get(i);
-				ccyl=Arith.add(ccyl, d.getCzcd());
-                jcyl=Arith.add(jcyl, d.getJzcd());
-                yh =Arith.add(yh ,d.getHd());
-                jzl =Arith.add(jzl, d.getCdl());
-                zlc =Arith.add(zlc, d.getZlc());
+				if(d.getLp()==null){
+					ccyl=Arith.add(ccyl, d.getCzcd());
+	                jcyl=Arith.add(jcyl, d.getJzcd());
+	                yh =Arith.add(yh ,d.getHd());
+	                jzl =Arith.add(jzl, d.getCdl());
+	                zlc =Arith.add(zlc, d.getZlc());
+				}else{
+					if(d.getLp().equals(s.getLpName())){
+						ccyl=Arith.add(ccyl, d.getCzcd());
+		                jcyl=Arith.add(jcyl, d.getJzcd());
+		                yh =Arith.add(yh ,d.getHd());
+		                jzl =Arith.add(jzl, d.getCdl());
+		                zlc =Arith.add(zlc, d.getZlc());
+					}
+				}
+				
 			}
         }
-      
-        
         map.put("jzl", jzl);
         map.put("yh", yh);
         map.put("ccyl", ccyl);