路单年报、月报表中，无路单的油耗电耗没有被统计的问题。

娄高锋
1 parent 7b024f9f
Showing 2 changed files with 121 additions and 25 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
 package com.bsth.repository.calc;
+import java.util.Date;
 import java.util.List;
 import javax.transaction.Transactional;
 import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.BaseRepository;
@@ -90,4 +93,15 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
             "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.fgsdm,c.xl,c.rqStr")
 	List<CalcWaybill> scheduleByDateAndLineTjPx(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
+	//路单没有的加油
+	@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))")
+	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))")
+	List<Dlb> DlbNotSchedule(List<String> line,Date date,Date date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 }
@@ -12,6 +12,7 @@ import com.bsth.entity.calc.CalcLineMileage;
 import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.calc.CalcWaybillDetail;
+import com.bsth.entity.oil.Cwjy;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -1902,6 +1903,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	@Override
 	public List<List<String>> calcDetailMonthly(Map<String, Object> map) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 		List<Integer> destroy= new ArrayList<>();
 		String destroyStr = "";
 		if(map.get("destroy")!=null){
@@ -1959,18 +1961,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(map.get("itemDetails")!=null){
 			itemDetails=map.get("itemDetails").toString().trim();
 		}
-//		Boolean item=false;
-		/*String item="";
-		if(map.get("item")!=null){
-			if("dh".equals(map.get("item").toString().trim()))
-				item=" where c.sfdc = 1";
-//				item=false;
-			else if ("dh".equals(map.get("item").toString().trim()))
-				item=" where c.sfdc = 0";
-//				item=true;
-			else
-				item="";
-		}*/
 		String timeType=map.get("timeType").toString().trim();
 		List<List<String>> resList = new ArrayList<>();
@@ -2016,17 +2006,116 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		} else if("xl".equals(statisticalObj)){
 			flag = 4;
 			list = calcRepository.scheduleByDateAndLineTjPx(line,startDate,endDate,gsdm,fgsdm, destroy);
-			/*if(line.equals("")){
-				//查询所有线路
-			}else{
-				//查询单条线路
-				list = calcRepository.scheduleByDateAndLineTjPx2(line,startDate,endDate);
-			}*/
 		}
 		// List类转换
 		final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
+		
+		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){
+				Date ylbrq = y.getRq();
+				String ylbxl = y.getXlbm();
+				String ylbgs = y.getSsgsdm();
+				String ylbfgs = y.getFgsdm();
+				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()
+							&& ylbgs.equals(cw.getGsdm())
+							&& ylbfgs.equals(cw.getFgsdm())
+							&& ylbxl.equals(cw.getXl())){
+						f = true;
+						l = i;
+						break;
+					}
+				}
+				if(f){
+					CalcWaybillDetail cw = listNew.get(l);
+					CalcWaybillDetail cNew = new CalcWaybillDetail();
+					cNew.setRq(cw.getRq());
+					cNew.setRqStr(cw.getRqStr());
+					cNew.setXl(cw.getXl());
+					cNew.setXlName(cw.getXlName());
+					cNew.setGsdm(cw.getGsdm());
+					cNew.setGsname(cw.getGsname());
+					cNew.setFgsdm(cw.getFgsdm());
+					cNew.setFgsname(cw.getFgsname());
+					cNew.setCl(y.getNbbm());
+					cNew.setjGh(y.getJsy());
+					cNew.setjName(BasicData.allPerson.get(y.getSsgsdm()+"-"+y.getJsy()));
+					listNew.add(l+1, cNew);
+				} else {
+					CalcWaybillDetail cNew = new CalcWaybillDetail();
+					cNew.setRq(ylbrq);
+					cNew.setRqStr(dateFormat.format(ylbrq));
+					cNew.setXl(ylbxl);
+					cNew.setXlName(BasicData.lineCodeAllNameMap.get(ylbxl));
+					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.setCl(y.getNbbm());
+					cNew.setjGh(y.getJsy());
+					cNew.setjName(BasicData.allPerson.get(y.getSsgsdm()+"-"+y.getJsy()));
+					listNew.add(listNew.size(), cNew);
+				}
+			}
+			for(Dlb d : dlbNotSchedule){
+				Date dlbrq = d.getRq();
+				String dlbxl = d.getXlbm();
+				String dlbgs = d.getSsgsdm();
+				String dlbfgs = d.getFgsdm();
+				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()
+							&& dlbgs.equals(cw.getGsdm())
+							&& dlbfgs.equals(cw.getFgsdm())
+							&& dlbxl.equals(cw.getXl())){
+						f = true;
+						l = i;
+						break;
+					}
+				}
+				if(f){
+					CalcWaybillDetail cw = listNew.get(l);
+					CalcWaybillDetail cNew = new CalcWaybillDetail();
+					cNew.setRq(cw.getRq());
+					cNew.setRqStr(cw.getRqStr());
+					cNew.setXl(cw.getXl());
+					cNew.setXlName(cw.getXlName());
+					cNew.setGsdm(cw.getGsdm());
+					cNew.setGsname(cw.getGsname());
+					cNew.setFgsdm(cw.getFgsdm());
+					cNew.setFgsname(cw.getFgsname());
+					cNew.setCl(d.getNbbm());
+					cNew.setjGh(d.getJsy());
+					cNew.setjName(BasicData.allPerson.get(d.getSsgsdm()+"-"+d.getJsy()));
+					listNew.add(l+1, cNew);
+				} else {
+					CalcWaybillDetail cNew = new CalcWaybillDetail();
+					cNew.setRq(dlbrq);
+					cNew.setRqStr(dateFormat.format(dlbrq));
+					cNew.setXl(dlbxl);
+					cNew.setXlName(BasicData.lineCodeAllNameMap.get(dlbxl));
+					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.setCl(d.getNbbm());
+					cNew.setjGh(d.getJsy());
+					cNew.setjName(BasicData.allPerson.get(d.getSsgsdm()+"-"+d.getJsy()));
+					listNew.add(listNew.size(), cNew);
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		if(listNew.size() <= 0){
 			return resList;
@@ -2052,11 +2141,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				linesql +=" and fgsdm in("+fgsdmStr+") ";
 			}
 			String ylsql="SELECT * FROM bsth_c_ylb"
-//			String ylsql="SELECT id,xlbm,nbbm,jsy,jzl,czyl,jzyl,yh,sh,fgsdm FROM bsth_c_ylb"
 					+ " WHERE rq >= '"+startDate+"' and rq <= '"+endDate+"' "
 					+ linesql;
 			String dlSal=  " SELECT * FROM bsth_c_dlb"
-//			String dlSal=  " SELECT id,xlbm,nbbm,jsy,cdl,czcd,jzcd,hd,sh,fgsdm FROM bsth_c_dlb"
 					+ " WHERE rq >= '"+startDate+"' and rq <= '"+endDate+"' "
 					+ linesql;
 			List<Ylb> ylbList = jdbcTemplate.query(ylsql, new RowMapper<Ylb>() {
@@ -2121,9 +2208,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     yo.setYh(Arith.add(yo.getYh(),y.getYh()));
                 } else
 				    ylbMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm(),y);
-
-//				ylbMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getJname()+"_"+y.getNbbm(),y);
-//				ylbCLMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getNbbm(),y);
 			}
 			for (Dlb d:dlbList) {
 			    if(dlbMap.containsKey(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm())){
@@ -2135,8 +2219,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     dold.setCdl(Arith.add(dold.getCdl(),d.getCdl()));
                 } else
 				    dlbMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm(),d);
-//				dlbMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getJname()+"_"+d.getNbbm(),d);
-//				dlbCLMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getNbbm(),d);
 			}
 		}