路单线路明细月报表、年报表，营运线路选项无效的问题。

娄高锋
1 parent b5dba7cb
Showing 4 changed files with 64 additions and 47 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/resources/static/pages/forms/calc/calcDetailMonthly.html
src/main/resources/static/pages/forms/calc/calcDetailYear.html
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.transaction.Transactional;
+import com.bsth.entity.Line;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
@@ -61,6 +62,18 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1")
 	List<ScheduleRealInfo> findAllScheduleByDate(String schDate);
+	/** 全部线路性质 */
+	@Query("select DISTINCT l.nature from Line l")
+	List<String> allLineNature();
+	
+	/** 营运线路性质 */
+	@Query("select DISTINCT l.nature from Line l where nature in ('yxl','cgxl','gjxl','csbs','cctxl')")
+	List<String> serviceLineNature();
+	
+	/** 非营运线路性质 */
+	@Query("select DISTINCT l.nature from Line l where nature not in ('yxl','cgxl','gjxl','csbs','cctxl')")
+	List<String> notServiceLineNature();
+	
 	//按照时间段统计，公司下线路 (驾驶员)
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and CONCAT(jGh,'/',jName) like %?6% order by c.xl")
@@ -78,40 +91,42 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	//按照时间段统计，公司下线路 (驾驶员)
 	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by c.jGh,c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleByJsy2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroym, List<String> line);
+            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by c.jGh,c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleByJsy2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
 	//按照时间段统计，公司下线路 (售票员) coalesce(c.sGh,'')
 	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) and c.sGh <> null  and c.sGh <> '' " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6))  order by c.sGh,c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleBySpy2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6))  order by c.sGh,c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleBySpy2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
 	//按照时间段统计，公司下线路 (车辆自编号)
 	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by c.cl,c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleByZbh2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by c.cl,c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleByZbh2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
 	//按照时间段统计，公司下线路 排序不同
 	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleByDateAndLineTjPx(String date, String date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleByDateAndLineTjPx(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
 	//路单没有的加油
 	@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.rq >= ?1 and y.rq <= ?2 and y.ssgsdm in(?3) and y.fgsdm in(?4) and c.id is null " +
-	        "and y.xlbm in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by y.rq desc")	//按日期倒序，方便插入list
-	List<Ylb> ylbNotSchedule(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+	        "and y.xlbm in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by y.rq desc")	//按日期倒序，方便插入list
+	List<Ylb> ylbNotSchedule(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
-	//路单没有的加油
+	//路单没有的加电
 	@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.rq >= ?1 and d.rq <= ?2 and d.ssgsdm in(?3) and d.fgsdm in(?4) and c.id is null " +
-	        "and d.xlbm in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by d.rq desc")	//按日期倒序，方便插入list
-	List<Dlb> dlbNotSchedule(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+	        "and d.xlbm in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by d.rq desc")	//按日期倒序，方便插入list
+	List<Dlb> dlbNotSchedule(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
+	//所有的加油，包含没有路单的
 	@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.rq >= ?1 and y.rq <= ?2 and y.ssgsdm in(?3) and y.fgsdm in(?4) " +
-	        "and y.xlbm in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by y.rq desc")	//按日期倒序，方便插入list
-	List<Ylb> ylb(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+	        "and y.xlbm in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by y.rq desc")	//按日期倒序，方便插入list
+	List<Ylb> ylb(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
+	//所有的加电，包含没有路单的
 	@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.rq >= ?1 and d.rq <= ?2 and d.ssgsdm in(?3) and d.fgsdm in(?4) " +
-	        "and d.xlbm in (select l.lineCode from Line l where l.destroy in (?5) and l.lineCode in (?6)) order by d.rq desc")	//按日期倒序，方便插入list
-	List<Dlb> dlb(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<Integer> destroy, List<String> line);
+	        "and d.xlbm in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by d.rq desc")	//按日期倒序，方便插入list
+	List<Dlb> dlb(Date date, Date date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
 }
@@ -1930,13 +1930,13 @@ 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 = "";
+		
+		List<String> nature = calcRepository.allLineNature();
 		if(map.get("destroy")!=null){
-			destroyStr = map.get("destroy").toString().trim();
-			String[] destroys = destroyStr.split(",");
-			for (int i = 0; i < destroys.length; i++){
-				destroy.add(Integer.parseInt(destroys[i]));
+			if("1".equals(map.get("destroy").toString())){
+				nature = calcRepository.serviceLineNature();
+			} else if("2".equals(map.get("destroy").toString())){
+				nature = calcRepository.notServiceLineNature();
 			}
 		}
 		List<String> gsdm= new ArrayList<>();
@@ -2035,16 +2035,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		int flag = 0;
 		if("jsy".equals(statisticalObj)){
 			flag = 1;
-			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdm, nature, line);
 		} else if("cwy".equals(statisticalObj)){
 			flag = 2;
-			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdm, nature, line);
 		} else if("cl".equals(statisticalObj)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh2( startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleByZbh2( startDate, endDate, gsdm, fgsdm, nature, line);
 		} else if("xl".equals(statisticalObj)){
 			flag = 4;
-			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdm, nature, line);
 		}
@@ -2054,8 +2054,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(flag != 2)
 		try {
 			//查询出没有路单的加油充电，插入到上面查询的结果集中汇总计算。
-			List<Ylb> ylbNotSchedule = calcRepository.ylbNotSchedule(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy, line);
-			List<Dlb> dlbNotSchedule = calcRepository.dlbNotSchedule(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy, line);
+			List<Ylb> ylbNotSchedule = calcRepository.ylbNotSchedule(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, nature, line);
+			List<Dlb> dlbNotSchedule = calcRepository.dlbNotSchedule(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, nature, line);
 			for(Ylb y : ylbNotSchedule){
 				Date ylbrq = y.getRq();
 				String ylbxl = y.getXlbm();
@@ -2773,13 +2773,13 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat dateFormatMon = new SimpleDateFormat("yyyy-MM");
         DecimalFormat df = new DecimalFormat("0.000");//格式化小数
-		List<Integer> destroy= new ArrayList<>();
-		String destroyStr = "";
+        
+		List<String> nature = calcRepository.allLineNature();
 		if(map.get("destroy")!=null){
-			destroyStr = map.get("destroy").toString().trim();
-			String[] destroys = destroyStr.split(",");
-			for (int i = 0; i < destroys.length; i++){
-				destroy.add(Integer.parseInt(destroys[i]));
+			if("1".equals(map.get("destroy").toString())){
+				nature = calcRepository.serviceLineNature();
+			} else if("2".equals(map.get("destroy").toString())){
+				nature = calcRepository.notServiceLineNature();
 			}
 		}
 		List<String> gsdm= new ArrayList<>();
@@ -2876,16 +2876,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		int flag = 0;
 		if("jsy".equals(statisticalObj)){
 			flag = 1;
-			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdm, nature, line);
 		} else if("cwy".equals(statisticalObj)){
 			flag = 2;
-			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdm, nature, line);
 		} else if("cl".equals(statisticalObj)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh2( startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleByZbh2( startDate, endDate, gsdm, fgsdm, nature, line);
 		} else if("xl".equals(statisticalObj)){
 			flag = 4;
-			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdm, destroy, line);
+			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdm, nature, line);
 		}
 		// List类转换
@@ -2909,8 +2909,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(flag != 2){
 			try {
-				List<Ylb> ylb = calcRepository.ylb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy, line);
-				List<Dlb> dlb = calcRepository.dlb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy, line);
+				List<Ylb> ylb = calcRepository.ylb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, nature, line);
+				List<Dlb> dlb = calcRepository.dlb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, nature, line);
 				for(Ylb y : ylb){
 					String key = y.getSsgsdm() + "_" + y.getFgsdm() + "_" + y.getXlbm();
@@ -2925,6 +2925,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cNew.setXl(y.getXlbm());
 					cNew.setXlName(BasicData.lineCodeAllNameMap.get(y.getXlbm()));
 					cNew.setGsdm(y.getSsgsdm());
+					System.out.println("map:" + BasicData.businessCodeNameMap);
+					System.out.println(y.getSsgsdm());
 					cNew.setGsname(BasicData.businessCodeNameMap.get(y.getSsgsdm()));
 					cNew.setFgsdm(y.getFgsdm());
 					cNew.setFgsname(BasicData.businessFgsCodeNameMap.get(y.getFgsdm()+"_"+y.getSsgsdm()));
@@ -86,9 +86,9 @@
             <div style="display: inline-block; margin-left: 13px;">
                 <span class="item-label" style="width: 80px;">线路性质: </span>
                 <select class="form-control" name="destroy" id="destroy" style="width: 150px;">
-                    <option value="0,1">全部线路</option>
-                    <option value="0">营运线路</option>
-                    <option value="1">非营运线路</option>
+                    <option value="0">全部线路</option>
+                    <option value="1">营运线路</option>
+                    <option value="2">非营运线路</option>
                 </select>
             </div>
             <div style="display: inline-block;margin-left: 13px;">
@@ -86,9 +86,9 @@
             <div style="display: inline-block; margin-left: 13px;">
                 <span class="item-label" style="width: 80px;">线路性质: </span>
                 <select class="form-control" name="destroy" id="destroy" style="width: 150px;">
-                    <option value="0,1">全部线路</option>
-                    <option value="0">营运线路</option>
-                    <option value="1">非营运线路</option>
+                    <option value="0">全部线路</option>
+                    <option value="1">营运线路</option>
+                    <option value="2">非营运线路</option>
                 </select>
             </div>
             <div style="display: inline-block;margin-left: 13px;">