LGF 调度日报表月统计

娄高锋
1 parent 832c3a08
Showing 4 changed files with 69 additions and 22 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/scheduleDaily_m.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -30,7 +30,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
-	
+
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
@@ -119,6 +119,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
+
+	//按月统计
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY realExecDate,fcsj,xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
@@ -525,6 +525,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						map.put("fast", "");
 						map.put("slow", "");
 					}
+					System.out.println(map);
 					listMap.add(map);
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -1386,7 +1387,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<Map<String, Object>> statisticsDaily(String line, String date,
                                                      String xlName, String type) {
-        List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+    	List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+    	if(date.length() == 10)
+    		list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+    	else if(date.length() == 7)
+    		list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
@@ -2563,7 +2568,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 								map.put("fast", "");
 								map.put("slow", "");
 							}
-						listMap.add(map);
+							System.out.println(map);
+							listMap.add(map);
 						} catch (Exception e) {
 							e.printStackTrace();
 						} 
@@ -2591,13 +2597,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("jzl", jzl);
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
-		map.put("ssgl", format.format(remgl));
+		map.put("ssgl", format.format(remMileage));
 		map.put("ksgl", format.format(ksgl));
 		map.put("yyglsj", format.format(yygl));
 		map.put("jhbc", jhbc);
 		map.put("jcclc", jcclc);
-		map.put("ljgl", format.format(addgl));
+		map.put("ljgl", format.format(addMileage));
 		map.put("ssbc", cjbc);
 		map.put("ysgl", format.format(yygl));
 		map.put("sjbc", jhbc-cjbc+ljbc);
@@ -3114,7 +3120,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				listI.add(dataList2.iterator());
 				listI.add(dataList3.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleDaily.xls",
+				String sourcePath = path+"mould/scheduleDaily.xls";
+				if(date.length() == 7){
+					sdfMonth = new SimpleDateFormat("yyyy-MM");
+					sdfSimple = new SimpleDateFormat("yyyyMM");
+					sourcePath = path+"mould/scheduleDaily_m.xls";
+				}
+				ee.excelReplace(listI, new Object[] { m }, sourcePath,
 						path+"export/调度日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
@@ -37,6 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="month" value="按月查询"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
@@ -51,8 +52,8 @@
 							</tr>
 							<tr>
 								<td rowspan="3">路线别</td>
-								<td colspan="16">全日营运里程（公里）</td>
-								<td colspan="15">全日营运班次</td>
+								<td colspan="16"><c>全日</c>营运里程（公里）</td>
+								<td colspan="15"><c>全日</c>营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
@@ -83,22 +84,22 @@
 								<td>气候</td>
 								<td>援外</td>
 								<td>其他</td>
-								<td>全日</td>
+								<td><c>全日</c></td>
 								<td>早高峰</td>
 								<td>晚高峰</td>
-								<td>全日</td>
+								<td><c>全日</c></td>
 								<td>早高峰</td>
 								<td>晚高峰</td>
-								<td>全日</td>
+								<td><c>全日</c></td>
 								<td>早高峰</td>
 								<td>晚高峰</td>
-								<td>全日</td>
+								<td><c>全日</c></td>
 								<td>早高峰</td>
 								<td>晚高峰</td>
-								<td>全日</td>
+								<td><c>全日</c></td>
 								<td>早高峰</td>
 								<td>晚高峰</td>
-								<td>全日</td>
+								<td><c>全日</c></td>
 								<td>早高峰</td>
 								<td>晚高峰</td>
 							</tr>
@@ -273,15 +274,24 @@
 			initPinYinSelect2('#line',data,'');
 		})
+		
+		$('#export').attr('disabled', "true");
+		
+		var line = $("#line").val();
+		var xlName = $("#select2-line-container").html();
+		var date = $("#date").val();
+		
 		//查询
 		$("#query").on('click',function(){
-			var line = $("#line").val();
-			var xlName = $("#select2-line-container").html();
-			var date = $("#date").val();
+			line = $("#line").val();
+			xlName = $("#select2-line-container").html();
+			date = $("#date").val();
 			if(date == null || date.length == 0){
 				layer.msg("请选择时间");
 				return;
 			}
+			$("c").html("全日");
+			$("#export").removeAttr("disabled");
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
 				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
@@ -298,22 +308,43 @@
 		});
+		//按月查询
+		$("#month").on('click',function(){
+			line = $("#line").val();
+			xlName = $("#select2-line-container").html();
+			date = $("#date").val();
+			if(date == null || date.length == 0){
+				layer.msg("请选择时间");
+				return;
+			}
+			date = date.substring(0, 7);
+			$("c").html("全月");
+			$("#export").removeAttr("disabled");
+			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
+				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
+				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
+			});
+			$('#forms .scheduleDaily_2').html("");
+			$('#forms .scheduleDaily_3').html("");
+			
+		});
+		
 		$("#export").on("click",function(){
 			var params = {};
-			var line = $("#line").val();
-			var xlName = $("#select2-line-container").html();
-			var date = $("#date").val();
 			if(date == null || date.length == 0){
 				layer.msg("请选择时间");
 				return;
 			}
 			params['line'] = line;
 			params['date'] = date;
-			params['xlName'] = "xlName";
+			params['xlName'] = xlName;
 			params['type'] = "export";
 			params['state'] = '2';
 			$get('/realSchedule/scheduleDailyExport', params, function(result){
-				window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
+				if(date.length == 10)
+					window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
+				else
+					window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMM"));
 			});
 		});