解决跨线路一次多单获取时重复加注量

廖磊
1 parent 209cf915
Showing 6 changed files with 136 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/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/history/history.html
@@ -58,6 +58,8 @@ public class Dlb {
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
 	private int jcsx;
+	
+	private String jname;
 	@Transient
 	private String name;
 	@Transient
@@ -73,6 +75,7 @@ public class Dlb {
 	private String fgsname;
+	
 	private String lp;
 	public Integer getId() {
@@ -391,6 +394,14 @@ public class Dlb {
 	public void setLp(String lp) {
 		this.lp = lp;
 	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
@@ -26,6 +26,7 @@ public class Ylb {
 	private String fgsdm;
 	private String nbbm;
 	private String jsy;
+	private String jname;
 	private Double czlc=0.0;
 	private Double jzlc=0.0;
 	private Double czyl=0.0;
@@ -339,6 +340,14 @@ public class Ylb {
 	public void setLp(String lp) {
 		this.lp = lp;
 	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
 }
@@ -193,10 +193,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,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")
+	@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,s.jName as jName ) 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,jName 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,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")
+	@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,s.jName as jName ) 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,jName 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")
@@ -203,6 +203,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setLp(map.get("lpName").toString());
 					t.setRq(sdf.parse(rq));
 					t.setCreatetime(new Date());
+					t.setJname(map.get("jName").toString());
 					/*if(type.equals("add")){
 						addList.add(t);
 					}else{
@@ -257,13 +258,13 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			// 保留两位小数
 			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
-			// 当天YLB信息
-			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+			// 当天DLB信息
+			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
-			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
 		    Map<String, Double> lcMap=new HashMap<String,Double>();
 			for (int i = 0; i < listpbs.size(); i++) {
 				String cl=listpbs.get(i).get("clZbh").toString();
@@ -295,7 +296,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			if(sxtj.equals("0")){
 				listpb=listpbs;
 			}else{
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, line,nbbm);
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
 				List<String> stringList=new ArrayList<String>();
 				for (int i = 0; i < objectLists.size(); i++) {
 					String clbm=objectLists.get(i)[0].toString();
@@ -468,6 +469,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 								t.setRq(sdf.parse(rq));
 								t.setLp(map.get("lpName").toString());
+								t.setJname(map.get("jName").toString());
 								if (!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))) {
 									if (t.getHd() < 0) {
 										t.setHd(0.0);
@@ -1023,7 +1025,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 		// 保留两位小数
 		DecimalFormat df = new DecimalFormat("#.00");
-		List<Dlb> dlbList=this.listOrderBy(date,gsdm,fgsdm,line,"","nbbm");
+		List<Dlb> dlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 		List<Dlb> dlbList_upd=new ArrayList<Dlb>(); 
 		List<Dlb> dlbList_del=new ArrayList<Dlb>(); 
 		try{
@@ -1047,7 +1049,9 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			}
 			if(fage){
-				dlbList_del.add(t);
+				if(t.getXlbm().equals(line)){
+					dlbList_del.add(t);
+				}
 			}
 		}
 		mapList.put("delList", dlbList_del);
@@ -1140,12 +1144,12 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								}
 								nextJzyl =Arith.sub(zjzl,dh);
 								if(zlc>0){
-									long l=Math.round(nextJzyl);
-									double ylxs=l*100/100;
+//									long l=Math.round(nextJzyl);
+									double ylxs=nextJzyl;
 									dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
 									if(dh<0){
-										t.setHd(dh);
-										t.setCdl(dh);
+										t.setHd(0.0);
+										t.setCdl(0.0);
 										nextJzyl=Arith.add(ylxs, dh);
 									}else{
 										t.setHd(dh);
@@ -1163,21 +1167,21 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								}
 								nextJzyl =Arith.sub( nextJzyl,dh);
 								if(zlc>0){
-									long l=0l;
+//									long l=0l;
 									double ylxs=0.0;
 									if(i==listpbDc.size()-1){
 //										ylxs=czyl;
 									}else{
 										if(listpbDc.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
-											l=Math.round(nextJzyl);
-											ylxs=l*100/100;
+//											l=Math.round(nextJzyl);
+											ylxs=nextJzyl;
 										}
 									}
 									dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
 									if(dh<0){
-										t.setHd(dh);
-										t.setCdl(dh);
+										t.setHd(0.0);
+										t.setCdl(0.0);
 										nextJzyl=Arith.add(ylxs, dh);
 									}else{
 										t.setHd(dh);
@@ -1211,7 +1215,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								 }
 							 }
-							
 							if(t.getHd()<0){
 								t.setHd(0.0);
 							}
@@ -198,6 +198,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						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.setJname(map.get("jName").toString());
 						t.setRq(sdf.parse(rq));
 						t.setCreatetime(dNow);
 						if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
@@ -272,24 +273,24 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
 			// 当天YLB信息
-			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe = this.listByRqJcsx(rq, gsbm, fgsbm, line, nbbm);
+			List<Ylb> ylListBe = this.listByRqJcsx(rq, gsbm, fgsbm, "", 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);
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
 			}else{
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, line,nbbm);
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
 				List<String> stringList=new ArrayList<String>();
 				for (int i = 0; i < objectLists.size(); i++) {
 					String clbm=objectLists.get(i)[0].toString();
@@ -363,49 +364,90 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
 					if (map.get("seqNumber").toString().equals("1")) {
 						boolean fage = true;
-						for (int i = 0; i < ylListBe.size(); i++) {
-							Ylb ylb = ylListBe.get(i);
-							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>0){
-									t.setCzyl(ylb.getJzyl());
-									fage = false;
-									break;
+						if(line.equals("")){
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb = ylListBe.get(i);
+								if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+									if(ylb.getJzyl()>0){
+										t.setCzyl(ylb.getJzyl());
+										fage = false;
+										break;
+									}
+									
 								}
-								
 							}
-						}
-						if (fage) {
-							for (int y = 0; y < clyList.size(); y++) {
-								Cyl cyl = clyList.get(y);
-								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl!=null){
-										if(cyl.getCyl()>=0){
-											t.setCzyl(cyl.getCyl());
+							if (fage) {
+								for (int y = 0; y < clyList.size(); y++) {
+									Cyl cyl = clyList.get(y);
+									if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+										if(cyl!=null){
+											if(cyl.getCyl()>=0){
+												t.setCzyl(cyl.getCyl());
+												fage = false;
+												break;
+											}else {
+												if(cyl.getCxrl()!=null){
+													if(cyl.getCxrl()>0){
+														t.setCzyl(cyl.getCxrl());
+														fage = false;
+														break;
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+							if (fage) {
+								t.setCzyl(0.0);
+							}
+						}else{
+							if (line.equals(map.get("xlBm").toString())) {
+								for (int i = 0; i < ylListBe.size(); i++) {
+									Ylb ylb = ylListBe.get(i);
+									if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+										if(ylb.getJzyl()>0){
+											t.setCzyl(ylb.getJzyl());
 											fage = false;
 											break;
-										}else {
-											if(cyl.getCxrl()!=null){
-												if(cyl.getCxrl()>0){
-													t.setCzyl(cyl.getCxrl());
+										}
+										
+									}
+								}
+								if (fage) {
+									for (int y = 0; y < clyList.size(); y++) {
+										Cyl cyl = clyList.get(y);
+										if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+											if(cyl!=null){
+												if(cyl.getCyl()>=0){
+													t.setCzyl(cyl.getCyl());
 													fage = false;
 													break;
+												}else {
+													if(cyl.getCxrl()!=null){
+														if(cyl.getCxrl()>0){
+															t.setCzyl(cyl.getCxrl());
+															fage = false;
+															break;
+														}
+													}
 												}
 											}
 										}
 									}
 								}
+								if (fage) {
+									t.setCzyl(0.0);
+								}
 							}
 						}
-						if (fage) {
-							t.setCzyl(0.0);
-						}
+						
 					}
 					Double jzl = 0.0;
 					//一人一车加注量只匹配一次
-					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
+					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())==null){
-					}else{
 						boolean fage2=false;
 						for (int i = 0; i < ylxxList.size(); i++) {
 							Ylxxb ylxxb = ylxxList.get(i);
@@ -455,6 +497,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					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());
+					t.setJname(map.get("jName").toString());
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
 							 t.setCreatetime(date);
@@ -760,7 +803,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				nbbm=map.get("nbbm_eq").toString();
 			}
 //			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
-			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
+			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
 			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
@@ -815,6 +858,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setNbbm(y1.getNbbm());
 						t.setRq(y1.getYyrq());
 						t.setJsy(y1.getJsy());
+						t.setJname(BasicData.allPerson.get(y1.getGsdm()+"-"+y1.getJsy()));
 						t.setJzl(y1.getJzl());
 						t.setSsgsdm(y1.getGsdm());
 						String fgsdm="";
@@ -1635,9 +1679,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				fgsdm=l.getBrancheCompany();
 			}
+			String nbbmstr="";
 			List<Map<String, Object>> listpbYc=new ArrayList<Map<String, Object>>();//油车数据
 			List<Map<String, Object>> listpbDc=new ArrayList<Map<String, Object>>();//电车数据
-			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line, date,gsdm, fgsdm, "", "");
+			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", date,gsdm, fgsdm, "", "");
+			for (int i = 0; i < listpb.size(); i++) {
+				if(listpb.get(i).get("xlBm").toString().equals(line)){
+					nbbmstr +=listpb.get(i).get("clZbh").toString();
+				}
+			}
 			for (int i = 0; i < listpb.size(); i++) {
 				boolean sfdc=true;
 				Map<String, Object> m = listpb.get(i);
@@ -1646,10 +1696,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				} else {
 					sfdc = true;
 				}
-				if(sfdc){
-					listpbDc.add(m);
-				}else{
-					listpbYc.add(m);
+				if(nbbmstr.indexOf(m.get("clZbh").toString())>-1){
+					if(sfdc){
+						listpbDc.add(m);
+					}else{
+						listpbYc.add(m);
+					}
 				}
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1657,8 +1709,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Cyl> clyList = cylRepository.obtainCyl("",gsdm);
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
 			//重新统计油车数据开始
-			List<Ylb> ylListBe =repository.listMaxRqJcsx(date, gsdm, fgsdm, line, "");
-			List<Ylb> ylbList=this.listOrderBy(date,gsdm,fgsdm,line,"","nbbm");
+			List<Ylb> ylListBe =repository.listByRqJcsx(date, gsdm, fgsdm, "", "");
+			List<Ylb> ylbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 			List<Ylb> ylbList_upd=new ArrayList<Ylb>(); 
 			List<Ylb> ylbList_del=new ArrayList<Ylb>(); 
@@ -1681,7 +1733,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					}
 				}
 				if(fage){
-					ylbList_del.add(t);
+					if(t.getXlbm().equals(line)){
+						ylbList_del.add(t);
+					}
 				}
 			}
@@ -1790,6 +1844,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJzl(jzl);
 					t.setNbbm(maps.get("clZbh").toString());
 					t.setJsy(maps.get("jGh") == null ? "" : maps.get("jGh").toString());
+					t.setJname(maps.get("jName").toString());
 					t.setZlc(maps.get("totalKilometers") == null ? 0.0
 							: Double.parseDouble(maps.get("totalKilometers").toString()));
 					t.setXlbm(maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
@@ -1820,7 +1875,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					}
 			    }
-			
 				for (int i = 0; i < ylbList_del.size(); i++) {
 					Ylb y=ylbList_del.get(i);
 					if(nbbmStr.indexOf(y.getNbbm())<0){
@@ -1831,7 +1885,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				//重新计算删除了的或者新增了的车的车的油耗信息（考虑车辆可能跨线路，从分公司赛选计算）
 				double czyl=0.0;
-				List<Ylb> iterator2=this.listOrderBy(date,gsdm,fgsdm,line,"","nbbm,jcsx");
+				List<Ylb> iterator2=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm,jcsx");
 				String[] nbbms=nbbmStr.split(",");
 				for (int i = 0; i < nbbms.length; i++) {
 					String clzbm=nbbms[i];
@@ -43,7 +43,7 @@
                     <div style="display: inline-block;margin-left: 24px;">
                         <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
                          <select class="form-control"  id="date" style="width: 180px;">
-                         	<option value="2017-11-07">2017-11-07</option>
+                         	<option value="2017-12-05">2017-12-05</option>
                          </select>
                     </div>
                     <div class="form-group">