路单详情添加线路性质筛选条件

游瑞烽
1 parent dde6ff42
Showing 4 changed files with 52 additions and 27 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
@@ -74,19 +74,20 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	//按照时间段统计，公司下线路 (驾驶员)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) order by c.jGh,c.fgsdm,c.xl,c.rq")
-	List<CalcWaybill> scheduleByJsy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) " +
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.jGh,c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleByJsy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//按照时间段统计，公司下线路 (售票员) coalesce(c.sGh,'')
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) and c.sGh <> null  and c.sGh <> '' order by c.sGh,c.fgsdm,c.xl,c.rq")
-	List<CalcWaybill> scheduleBySpy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) and c.sGh <> null  and c.sGh <> '' " +
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6))  order by c.sGh,c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleBySpy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//按照时间段统计，公司下线路 (车辆自编号)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) order by c.cl,c.fgsdm,c.xl,c.rq")
-	List<CalcWaybill> scheduleByZbh2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) " +
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.cl,c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleByZbh2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//按照时间段统计，公司下线路 排序不同
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) order by c.fgsdm,c.xl,c.rq")
-	List<CalcWaybill> scheduleByDateAndLineTjPx(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
-	//按照时间段统计，单条线路 排序不同
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl = ?1  and c.rqStr between ?2 and ?3 order by c.xl,c.rq")
-	List<CalcWaybill> scheduleByDateAndLineTjPx2(String line,String date,String date2);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) " +
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleByDateAndLineTjPx(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 }
@@ -1812,14 +1812,15 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	@Override
 	public List<List<String>> calcDetailMonthly(Map<String, Object> map) {
-//		String gsdm="";
-//		if(map.get("gsdm")!=null){
-//			gsdm=map.get("gsdm").toString().trim();
-//		}
-//		String fgsdm="";
-//		if(map.get("fgsdm")!=null){
-//			fgsdm=map.get("fgsdm").toString().trim();
-//		}
+		List<Integer> destroy= new ArrayList<>();
+		String destroyStr = "";
+		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]));
+			}
+		}
 		List<String> gsdm= new ArrayList<>();
 		String gsdmStr = "";
 		if(map.get("gsdm")!=null){
@@ -1915,16 +1916,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		int flag = 0;
 		if("jsy".equals(statisticalObj)){
 			flag = 1;
-			list = calcRepository.scheduleByJsy2(line, startDate, endDate, gsdm, fgsdm);
+			list = calcRepository.scheduleByJsy2(line, startDate, endDate, gsdm, fgsdm, destroy);
 		} else if("cwy".equals(statisticalObj)){
 			flag = 2;
-			list = calcRepository.scheduleBySpy2(line, startDate, endDate, gsdm, fgsdm);
+			list = calcRepository.scheduleBySpy2(line, startDate, endDate, gsdm, fgsdm, destroy);
 		} else if("cl".equals(statisticalObj)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh2(line, startDate, endDate, gsdm, fgsdm);
+			list = calcRepository.scheduleByZbh2(line, startDate, endDate, gsdm, fgsdm, destroy);
 		} else if("xl".equals(statisticalObj)){
 			flag = 4;
-			list = calcRepository.scheduleByDateAndLineTjPx(line,startDate,endDate,gsdm,fgsdm);
+			list = calcRepository.scheduleByDateAndLineTjPx(line,startDate,endDate,gsdm,fgsdm, destroy);
 			/*if(line.equals("")){
 				//查询所有线路
 			}else{
@@ -73,7 +73,14 @@
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
                 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
             </div>-->
-
+            <div style="display: inline-block; margin-left: 33px;">
+                <span class="item-label" style="width: 80px;">线路性质: </span>
+                <select class="form-control" name="destroy" id="destroy" style="width: 180px;">
+                    <option value="0,1">全部线路</option>
+                    <option value="0">营运线路</option>
+                    <option value="1">非营运线路</option>
+                </select>
+            </div>
             <div style="display: inline-block;margin-left: 33px;" class="date-picker">
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
                 <input class="form-control" type="text" id="startDate" style="width: 180px;" /> -
@@ -144,7 +151,7 @@
         var d = new Date();
         var year = d.getFullYear();
         var month = d.getMonth() + 1;
-        var day = d.getDate()-1;//只能查一天以前的数据
+        var day = d.getDate()-3;//只能查3天以前的数据
         if(month < 10)
             month = "0" + month;
         if(day < 10)
@@ -244,6 +251,7 @@
             datas.timeType = "m";
             datas.startDate = startDate;
             datas.endDate = endDate;
+            datas.destroy = $("#destroy").val();
             datas.statisticalObj = $("#statisticalObj").val();
             datas.itemDetails = $("#itemDetails").val();
             if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
@@ -73,7 +73,14 @@
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
                 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
             </div>-->
-
+            <div style="display: inline-block; margin-left: 33px;">
+                <span class="item-label" style="width: 80px;">线路性质: </span>
+                <select class="form-control" name="destroy" id="destroy" style="width: 180px;">
+                    <option value="0,1">全部线路</option>
+                    <option value="0">营运线路</option>
+                    <option value="1">非营运线路</option>
+                </select>
+            </div>
             <div style="display: inline-block;margin-left: 33px;" class="date-picker">
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
                 <input class="form-control" type="text" id="startDate" style="width: 180px;" /> -
@@ -81,6 +88,7 @@
                 <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10"/> - -->
                 <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10"/>-->
             </div>
+
             <div style="margin-top: 2px"></div>
             <div style="display: inline-block;margin-left: 33px;">
@@ -163,13 +171,19 @@
         });
-        var lineAll="";
+        var lineAll="",lineNoD="",lineD="";
         var datas = {}; //查询条件
         /**用户分配的线路*/
         $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
             lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
+           /* $.get('/line/all', function (lines) {
+                $.each(lines,function () {
+
+                });
+
+            });*/
         });
         var tempData = {};
@@ -244,6 +258,7 @@
             datas.lineCode = lineAll;
             datas.startDate = startDate;
             datas.endDate = endDate;
+            datas.destroy = $("#destroy").val();
             datas.statisticalObj = $("#statisticalObj").val();
             datas.itemDetails = $("#itemDetails").val();
             datas.item = item;