把无路单的加油充电数据加入到“路单线路明细年、月报表”中，为了保证查询结果与查询加油充电总量一致。

娄高锋
1 parent 441126ca
Showing 2 changed files with 187 additions and 24 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -96,12 +96,12 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	//路单没有的加油
 	@Query(value="select DISTINCT y from Ylb y left join CalcWaybill c on y.rq = c.rq and y.xlbm = c.xl and y.jsy = c.jGh and y.nbbm = c.cl " +
 			"where y.xlbm in(?1) and y.rq between ?2 and ?3 and y.ssgsdm in(?4) and y.fgsdm in(?5) and c.id is null " +
-	        "and y.xlbm in (select l.lineCode from Line l where l.destroy in (?6))")
+	        "and y.xlbm in (select l.lineCode from Line l where l.destroy in (?6)) order by y.rq desc")	//按日期倒序，方便插入list
 	List<Ylb> ylbNotSchedule(List<String> line,Date date,Date date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//路单没有的加油
 	@Query(value="select DISTINCT d from Dlb d left join CalcWaybill c on d.rq = c.rq and d.xlbm = c.xl and d.jsy = c.jGh and d.nbbm = c.cl " +
 			"where d.xlbm in(?1) and d.rq between ?2 and ?3 and d.ssgsdm in(?4) and d.fgsdm in(?5) and c.id is null " +
-	        "and d.xlbm in (select l.lineCode from Line l where l.destroy in (?6))")
+	        "and d.xlbm in (select l.lineCode from Line l where l.destroy in (?6)) order by d.rq desc")	//按日期倒序，方便插入list
 	List<Dlb> DlbNotSchedule(List<String> line,Date date,Date date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 }
@@ -2012,8 +2012,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		// List类转换
 		final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
-		if(flag == 4)
+		if(flag != 2)
 		try {
+			//查询出没有路单的加油充电，插入到上面查询的结果集中汇总计算。
 			List<Ylb> ylbNotSchedule = calcRepository.ylbNotSchedule(line, dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy);
 			List<Dlb> dlbNotSchedule = calcRepository.DlbNotSchedule(line, dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy);
 			for(Ylb y : ylbNotSchedule){
@@ -2021,17 +2022,68 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				String ylbxl = y.getXlbm();
 				String ylbgs = y.getSsgsdm();
 				String ylbfgs = y.getFgsdm();
+				String ylbnbbm = y.getNbbm();
+				String ylbjsy = y.getJsy();
+				y.setJname(y.getJname()!=null?y.getJname():BasicData.allPerson.get(ylbgs+"-"+ylbjsy));
+				String ylbjname = y.getJname();
+				if(flag == 4 && (ylbxl == null || ylbxl.trim().length() == 0)){
+					continue;
+				}
+				if(flag == 3 && (ylbnbbm == null || ylbnbbm.trim().length() == 0)){
+					continue;
+				}
+				if(flag == 1 && (ylbjsy == null || ylbjsy.trim().length() == 0)){
+					continue;
+				}
 				boolean f = false;
 				int l = listNew.size();
 				for(int i = 0; i < listNew.size(); i++){
 					CalcWaybillDetail cw = listNew.get(i);
-					if(ylbrq.getTime() == cw.getRq().getTime()
+					//线路、车辆、驾驶员三种类型，日期小的插入到前面，日期大的往后面放。
+					if(flag == 4
 							&& ylbgs.equals(cw.getGsdm())
 							&& ylbfgs.equals(cw.getFgsdm())
 							&& ylbxl.equals(cw.getXl())){
-						f = true;
-						l = i;
-						break;
+						if(ylbrq.getTime() < cw.getRq().getTime()){
+							f = false;
+							l = i;
+							break;
+						} else if(ylbrq.getTime() == cw.getRq().getTime()){
+							f = true;
+							l = i;
+							break;
+						}
+					}
+					if(flag == 3
+							&& ylbgs.equals(cw.getGsdm())
+							&& ylbfgs.equals(cw.getFgsdm())
+							&& ylbxl.equals(cw.getXl())
+							&& ylbnbbm.equals(cw.getCl())){
+						if(ylbrq.getTime() < cw.getRq().getTime()){
+							f = false;
+							l = i;
+							break;
+						} else if(ylbrq.getTime() == cw.getRq().getTime()){
+							f = true;
+							l = i;
+							break;
+						}
+					}
+					if(flag == 1
+							&& ylbgs.equals(cw.getGsdm())
+							&& ylbfgs.equals(cw.getFgsdm())
+							&& ylbxl.equals(cw.getXl())
+							&& ylbjsy.equals(cw.getjGh())
+							&& ylbjname.equals(cw.getjName())){
+						if(ylbrq.getTime() < cw.getRq().getTime()){
+							f = false;
+							l = i;
+							break;
+						} else if(ylbrq.getTime() == cw.getRq().getTime()){
+							f = true;
+							l = i;
+							break;
+						}
 					}
 				}
 				if(f){
@@ -2048,7 +2100,19 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cNew.setCl(y.getNbbm());
 					cNew.setjGh(y.getJsy());
 					cNew.setjName(BasicData.allPerson.get(y.getSsgsdm()+"-"+y.getJsy()));
-					listNew.add(l, cNew);
+					cNew.setZlc(y.getZlc());
+					cNew.setYh(y.getYh());
+					cNew.setJzl(y.getJzl());
+					if("0".equals(y.getRylx())){
+						cNew.setJzl0(y.getJzl());
+					}else if("1".equals(y.getRylx())){
+						cNew.setJzl10(y.getJzl());
+					}
+					cNew.setJzyl(y.getJzyl());
+					cNew.setCzyl(y.getCzyl());
+					cNew.setRylx(y.getRylx());
+					cNew.setBglyh((y.getZlc()==0? 0:100*y.getYh()/y.getZlc()));
+					listNew.add(l, cNew);	//日期更小或相同，插入到同类型的前面。
 				} else {
 					CalcWaybillDetail cNew = new CalcWaybillDetail();
 					cNew.setRq(ylbrq);
@@ -2058,11 +2122,23 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cNew.setGsdm(y.getSsgsdm());
 					cNew.setGsname(BasicData.businessCodeNameMap.get(y.getSsgsdm()));
 					cNew.setFgsdm(y.getFgsdm());
-					cNew.setFgsname(BasicData.businessFgsCodeNameMap.get(y.getFgsdm()+"_"+y.getFgsdm()));
+					cNew.setFgsname(BasicData.businessFgsCodeNameMap.get(y.getFgsdm()+"_"+y.getSsgsdm()));
 					cNew.setCl(y.getNbbm());
 					cNew.setjGh(y.getJsy());
 					cNew.setjName(BasicData.allPerson.get(y.getSsgsdm()+"-"+y.getJsy()));
-					listNew.add(listNew.size(), cNew);
+					cNew.setZlc(y.getZlc());
+					cNew.setYh(y.getYh());
+					cNew.setJzl(y.getJzl());
+					if("0".equals(y.getRylx())){
+						cNew.setJzl0(y.getJzl());
+					}else if("1".equals(y.getRylx())){
+						cNew.setJzl10(y.getJzl());
+					}
+					cNew.setJzyl(y.getJzyl());
+					cNew.setCzyl(y.getCzyl());
+					cNew.setRylx(y.getRylx());
+					cNew.setBglyh((y.getZlc()==0? 0:100*y.getYh()/y.getZlc()));
+					listNew.add(l, cNew);	//日期更大，插入到最后。
 				}
 			}
 			for(Dlb d : dlbNotSchedule){
@@ -2070,17 +2146,68 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				String dlbxl = d.getXlbm();
 				String dlbgs = d.getSsgsdm();
 				String dlbfgs = d.getFgsdm();
+				String dlbnbbm = d.getNbbm();
+				String dlbjsy = d.getJsy();
+				d.setJname(d.getJname()!=null?d.getJname():BasicData.allPerson.get(dlbgs+"-"+dlbjsy));
+				String dlbjname = d.getJname();
+				if(flag == 4 && (dlbxl == null || dlbxl.trim().length() == 0)){
+					continue;
+				}
+				if(flag == 3 && (dlbnbbm == null || dlbnbbm.trim().length() == 0)){
+					continue;
+				}
+				if(flag == 1 && (dlbjsy == null || dlbjsy.trim().length() == 0)){
+					continue;
+				}
 				boolean f = false;
 				int l = listNew.size();
 				for(int i = 0; i < listNew.size(); i++){
 					CalcWaybillDetail cw = listNew.get(i);
-					if(dlbrq.getTime() == cw.getRq().getTime()
+					//线路、车辆、驾驶员三种类型，日期小的插入到前面，日期大的往后面放。
+					if(flag == 4
 							&& dlbgs.equals(cw.getGsdm())
 							&& dlbfgs.equals(cw.getFgsdm())
 							&& dlbxl.equals(cw.getXl())){
-						f = true;
-						l = i;
-						break;
+						if(dlbrq.getTime() < cw.getRq().getTime()){
+							f = false;
+							l = i;
+							break;
+						} else if(dlbrq.getTime() == cw.getRq().getTime()){
+							f = true;
+							l = i;
+							break;
+						}
+					}
+					if(flag == 3
+							&& dlbgs.equals(cw.getGsdm())
+							&& dlbfgs.equals(cw.getFgsdm())
+							&& dlbxl.equals(cw.getXl())
+							&& dlbnbbm.equals(cw.getCl())){
+						if(dlbrq.getTime() < cw.getRq().getTime()){
+							f = false;
+							l = i;
+							break;
+						} else if(dlbrq.getTime() == cw.getRq().getTime()){
+							f = true;
+							l = i;
+							break;
+						}
+					}
+					if(flag == 1
+							&& dlbgs.equals(cw.getGsdm())
+							&& dlbfgs.equals(cw.getFgsdm())
+							&& dlbxl.equals(cw.getXl())
+							&& dlbjsy.equals(cw.getjGh())
+							&& dlbjname.equals(cw.getjName())){
+						if(dlbrq.getTime() < cw.getRq().getTime()){
+							f = false;
+							l = i;
+							break;
+						} else if(dlbrq.getTime() == cw.getRq().getTime()){
+							f = true;
+							l = i;
+							break;
+						}
 					}
 				}
 				if(f){
@@ -2097,7 +2224,13 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cNew.setCl(d.getNbbm());
 					cNew.setjGh(d.getJsy());
 					cNew.setjName(BasicData.allPerson.get(d.getSsgsdm()+"-"+d.getJsy()));
-					listNew.add(l, cNew);
+					cNew.setZlc(d.getZlc());
+					cNew.setHd(d.getHd());
+					cNew.setJzcd(d.getJzcd());
+					cNew.setCzcd(d.getCzcd());
+					cNew.setCdl(d.getCdl());
+					cNew.setBglyh((d.getZlc()==0? 0:100*d.getHd()/d.getZlc()));
+					listNew.add(l, cNew);	//日期更小或相同，插入到同类型的前面。
 				} else {
 					CalcWaybillDetail cNew = new CalcWaybillDetail();
 					cNew.setRq(dlbrq);
@@ -2107,13 +2240,22 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cNew.setGsdm(d.getSsgsdm());
 					cNew.setGsname(BasicData.businessCodeNameMap.get(d.getSsgsdm()));
 					cNew.setFgsdm(d.getFgsdm());
-					cNew.setFgsname(BasicData.businessFgsCodeNameMap.get(d.getFgsdm()+"_"+d.getFgsdm()));
+					cNew.setFgsname(BasicData.businessFgsCodeNameMap.get(d.getFgsdm()+"_"+d.getSsgsdm()));
 					cNew.setCl(d.getNbbm());
 					cNew.setjGh(d.getJsy());
 					cNew.setjName(BasicData.allPerson.get(d.getSsgsdm()+"-"+d.getJsy()));
-					listNew.add(listNew.size(), cNew);
+					cNew.setZlc(d.getZlc());
+					cNew.setHd(d.getHd());
+					cNew.setJzcd(d.getJzcd());
+					cNew.setCzcd(d.getCzcd());
+					cNew.setCdl(d.getCdl());
+					cNew.setBglyh((d.getZlc()==0? 0:100*d.getHd()/d.getZlc()));
+					listNew.add(l, cNew);	//日期更大，插入到最后。
 				}
 			}
+			
+			
+			
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
@@ -2171,6 +2313,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					ylb.setRylx(arg0.getString("rylx"));
 					ylb.setFgsdm(arg0.getString("fgsdm"));
 					ylb.setRq(rq);
+					if(ylb.getSsgsdm() != null && ylb.getFgsdm() != null){
+						ylb.setFgsname(BasicData.businessFgsCodeNameMap.get(ylb.getFgsdm()+"_"+ylb.getSsgsdm()));
+					}
 					return ylb;
 				}
 			});
@@ -2193,8 +2338,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					dlb.setCzcd(Double.parseDouble(arg0.getString("czcd")));
 					dlb.setHd(Double.parseDouble(arg0.getString("hd")));
 					dlb.setSh(Double.parseDouble(arg0.getString("sh")));
+					dlb.setSsgsdm(arg0.getString("ssgsdm"));
 					dlb.setFgsdm(arg0.getString("fgsdm"));
 					dlb.setRq(rq);
+					if(dlb.getSsgsdm() != null && dlb.getFgsdm() != null){
+						dlb.setFgsname(BasicData.businessFgsCodeNameMap.get(dlb.getFgsdm()+"_"+dlb.getSsgsdm()));
+					}
 					return dlb;
 				}
 			});
@@ -2311,9 +2460,17 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			CalcWaybillDetail dayc = null;
 			if("m".equals(timeType)){
-				while (!dayList.get(dayIndex).containsKey(cw.getRqStr())){
-					calcList.add(new CalcWaybillDetail());
-					dayIndex++;
+				if(calcList.size() < dayList.size()){	//列还没加满则往后加新的列
+					while (dayList.size() > dayIndex && !dayList.get(dayIndex).containsKey(cw.getRqStr())){
+						calcList.add(new CalcWaybillDetail());
+						dayIndex++;
+					}
+				} else {	//列已经加满说明是前面的日期
+					int temp = 0;
+					while (!dayList.get(temp).containsKey(cw.getRqStr())){
+						temp++;
+					}
+					dayIndex = temp;
 				}
 				dayc = dayList.get(dayIndex).get(cw.getRqStr());
 			} else if("y".equals(timeType)){
@@ -2341,7 +2498,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				CalcWaybillDetail cwd = new CalcWaybillDetail();
 				// 深度拷贝对象
 				BeanUtils.copyProperties(cw,cwd);
-				calcList.add(cwd);
+				if(calcList.size() <= dayIndex){	//把对象往后填
+					calcList.add(cwd);
+				} else {							//换行时会用空对象补完所有列，这里是把空的列替换掉。
+					calcList.remove(dayIndex);
+					calcList.add(dayIndex, cwd);
+				}
 				calc.setTs(calc.getTs()+1);
 				zjCalc.setTs(zjCalc.getTs()+1);
 			}
@@ -2354,10 +2516,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			} else if("y".equals(timeType) && cwNext != null && key.equals(keyNext) && !cw.getRqStr().substring(0,7).equals(cwNext.getRqStr().substring(0,7))){
 				dayIndex++;
 			} else if(!key.equals(keyNext)){
-				// 满数据的不用补空格
+				// 换行时把空位补上空的对象，满数据的不用补空格
                 while (dayList.size() > dayIndex+1){
-                    calcList.add(new CalcWaybillDetail());
                     dayIndex++;
+                    if(calcList.size() < dayList.size()){
+                    	calcList.add(new CalcWaybillDetail());
+                    }
                 }
                 // 换列了从头开始，上一个下标赋值为初始
 				dayIndexPrev = -1;
@@ -2502,7 +2666,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		double all = 0.0;
 		for (Map<String, CalcWaybillDetail> cmap:dayList) {
 			for (Map.Entry<String, CalcWaybillDetail> cw : cmap.entrySet()) {
-//				System.out.println("key = " + cw.getKey() + ", value = " + cw.getValue());
 				CalcWaybillDetail c1 = cw.getValue();
 				if("jzlAll".equals(itemDetails)){
 					listEnd.add(df.format(c1.getJzl()));