闵行工时统计报表：实际工时拆成营运和空驶，查询日期改成日期区间，加上全部线路的选项

娄高锋
1 parent b2655791
Showing 7 changed files with 167 additions and 68 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/workingHours.xls
src/main/resources/static/pages/forms/statement/workingHours.html
@@ -366,9 +366,9 @@ public class ReportController {
 	@RequestMapping(value="/workingHours" ,method = RequestMethod.POST)
 	public List<Map<String, Object>> workingHours(@RequestParam String gsdm, @RequestParam String fgsdm,
-			@RequestParam String line, @RequestParam String date, @RequestParam String gh, @RequestParam String cl,
-			@RequestParam String lineName, @RequestParam String type){
-		List<Map<String, Object>> list = service.workingHours(gsdm, fgsdm, line, date, gh, cl);
+			@RequestParam String line, @RequestParam String date, @RequestParam String date2, @RequestParam String gh,
+			@RequestParam String cl, @RequestParam String lineName, @RequestParam String type){
+		List<Map<String, Object>> list = service.workingHours(gsdm, fgsdm, line, date, date2, gh, cl);
 		if("export".equals(type)){
 			try {
 				ReportUtils ee = new ReportUtils();
@@ -182,6 +182,16 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.xlBm = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% order by s.gsBm, s.fgsBm, s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine4(String scheduleDate, String line, String gsdm, String fgsdm);
+
+	/**按日期区间线路查询*/
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr between ?1 and ?2 and s.xlBm = ?3 and s.gsBm like %?4% and s.fgsBm like %?5% order by s.gsBm, s.fgsBm, s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLine5(String date, String date2, String line, String gsdm, String fgsdm);
+
+	/**按日期区间查询*/
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr between ?1 and ?2 and s.gsBm like %?3% and s.fgsBm like %?4% order by s.gsBm, s.fgsBm, s.xlBm")
+	List<ScheduleRealInfo> scheduleByDates(String date, String date2, String gsdm, String fgsdm);
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -127,5 +127,11 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     @Query(value="select s from SchedulePlanInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 and s.xlBm = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%")
 	List<SchedulePlanInfo> findByDateAndLine(String scheduleDate, String line, String gsdm, String fgsdm);
+    
+    @Query(value="select s from SchedulePlanInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?1 and ?2 and s.xlBm = ?3 and s.gsBm like %?4% and s.fgsBm like %?5%")
+	List<SchedulePlanInfo> findByDatesAndLine(String date, String date2, String line, String gsdm, String fgsdm);
+    
+    @Query(value="select s from SchedulePlanInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?1 and ?2 and s.gsBm like %?3% and s.fgsBm like %?4%")
+	List<SchedulePlanInfo> findByDates(String date, String date2, String gsdm, String fgsdm);
 }
@@ -57,5 +57,5 @@ public interface ReportService {
 	 Map<String, Object> online(Map<String, Object> map);
-	 List<Map<String, Object>> workingHours(String gsdm, String fgsdm, String line, String date, String gh, String cl);
+	 List<Map<String, Object>> workingHours(String gsdm, String fgsdm, String line, String date, String date2, String gh, String cl);
  }
@@ -3558,60 +3558,108 @@ public class ReportServiceImpl implements ReportService{
 	}
 	@Override
-	public List<Map<String, Object>> workingHours(String gsdm, String fgsdm, String line, String date,
+	public List<Map<String, Object>> workingHours(String gsdm, String fgsdm, String line, String date, String date2,
 			String gh, String cl) {
 		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		List<SchedulePlanInfo> planList = schedulePlanInfoRepository.findByDateAndLine(date, line, gsdm, fgsdm);
-		List<ScheduleRealInfo> realList = scheduleRealInfoRepository.scheduleByDateAndLine4(date, line, gsdm, fgsdm);
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//		List<SchedulePlanInfo> planList = new ArrayList<SchedulePlanInfo>();
+		List<ScheduleRealInfo> realList = new ArrayList<ScheduleRealInfo>();
+		if(line != null && line.trim().length() > 0){
+//			planList = schedulePlanInfoRepository.findByDatesAndLine(date, date2, line, gsdm, fgsdm);
+			realList = scheduleRealInfoRepository.scheduleByDateAndLine5(date, date2, line, gsdm, fgsdm);
+		} else {
+//			planList = schedulePlanInfoRepository.findByDates(date, date2, gsdm, fgsdm);
+			realList = scheduleRealInfoRepository.scheduleByDates(date, date2, gsdm, fgsdm);
+		}
+		
+		
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
-		for(SchedulePlanInfo plan : planList){
-			String gsBm = plan.getGsBm();
-			String fgsBm = plan.getFgsBm();
-			String xlBm = plan.getXlBm();
-			String scheduleDate = sdf.format(plan.getScheduleDate());
-			String jGh = plan.getjGh();
-			String jName = plan.getjName();
-//			String sGh = plan.getsGh();
-//			String sName = plan.getsName();
-			String clZbh = plan.getClZbh();
-			String lpName = plan.getLpName();
-			Long bcsj = (long)plan.getBcsj();
-			
-			String key = gsBm + "/" + fgsBm + "/" + xlBm + "/" + scheduleDate + "/"
-						+ jGh + "/" + jName + "/" + clZbh + "/" + lpName;
-			if(!(keyMap.containsKey(key))){
-				Map<String, Object> m = new HashMap<String, Object>();
-				m.put("gsBm", gsBm);
-				m.put("fgsBm", fgsBm);
-				m.put("xlBm", xlBm);
-				m.put("date", scheduleDate);
-				m.put("jGh", jGh);
-				m.put("jName", jName);
-//				m.put("sGh", sGh);
-//				m.put("sName", sName);
-				m.put("clZbh", clZbh);
-				m.put("lpName", lpName);
-				m.put("jh", 0);
-				m.put("sj", 0);
-				keyMap.put(key, m);
+//		for(SchedulePlanInfo plan : planList){
+//			String gsBm = plan.getGsBm();
+//			String fgsBm = plan.getFgsBm();
+//			String xlBm = plan.getXlBm();
+////			String scheduleDate = sdf.format(plan.getScheduleDate());
+//			String jGh = plan.getjGh();
+//			String jName = plan.getjName();
+////			String sGh = plan.getsGh();
+////			String sName = plan.getsName();
+//			String clZbh = plan.getClZbh();
+//			String lpName = plan.getLpName();
+//			Long bcsj = (long)plan.getBcsj();
+//			
+//			String key = gsBm + "/" + fgsBm + "/" + xlBm + "/"
+//						+ jGh + "/" + jName + "/" + clZbh + "/" + lpName;
+//			if(!(keyMap.containsKey(key))){
+//				Map<String, Object> m = new HashMap<String, Object>();
+//				m.put("gsBm", gsBm);
+//				m.put("fgsBm", fgsBm);
+//				m.put("xlBm", xlBm);
+////				m.put("date", scheduleDate);
+//				m.put("jGh", jGh);
+//				m.put("jName", jName);
+////				m.put("sGh", sGh);
+////				m.put("sName", sName);
+//				m.put("clZbh", clZbh);
+//				m.put("lpName", lpName);
+//				m.put("jh", 0);
+//				m.put("sj", 0);
+//				keyMap.put(key, m);
+//			}
+//			Map<String, Object> map = keyMap.get(key);
+//			map.put("jh", bcsj + Long.valueOf(map.get("jh").toString()));
+//		}
+		for(ScheduleRealInfo plan : realList){
+			if(!(plan.isSflj()) && !(plan.isCcService())){
+				String gsBm = plan.getGsBm();
+				String fgsBm = plan.getFgsBm();
+				String xlBm = plan.getXlBm();
+//				String scheduleDate = sdf.format(plan.getScheduleDate());
+				String jGh = plan.getjGh();
+				String jName = plan.getjName();
+//				String sGh = plan.getsGh();
+//				String sName = plan.getsName();
+				String clZbh = plan.getClZbh();
+				String lpName = plan.getLpName();
+				Long bcsj = (long)plan.getBcsj();
+				
+				String key = gsBm + "/" + fgsBm + "/" + xlBm + "/"
+							+ jGh + "/" + jName + "/" + clZbh + "/" + lpName;
+				if(!(keyMap.containsKey(key))){
+					Map<String, Object> m = new HashMap<String, Object>();
+					m.put("gsBm", gsBm);
+					m.put("fgsBm", fgsBm);
+					m.put("xlBm", xlBm);
+//					m.put("date", scheduleDate);
+					m.put("jGh", jGh);
+					m.put("jName", jName);
+//					m.put("sGh", sGh);
+//					m.put("sName", sName);
+					m.put("clZbh", clZbh);
+					m.put("lpName", lpName);
+					m.put("jh", 0);
+					m.put("sjyy", 0);
+					m.put("sjks", 0);
+					keyMap.put(key, m);
+				}
+				Map<String, Object> map = keyMap.get(key);
+				map.put("jh", bcsj + Long.valueOf(map.get("jh").toString()));
 			}
-			Map<String, Object> map = keyMap.get(key);
-			map.put("jh", bcsj + Long.valueOf(map.get("jh").toString()));
 		}
 		for(ScheduleRealInfo real : realList){
 			Set<ChildTaskPlan> getcTasks = real.getcTasks();
 			String gsBm = real.getGsBm();
 			String fgsBm = real.getFgsBm();
 			String xlBm = real.getXlBm();
-			String scheduleDate = real.getScheduleDateStr();
+//			String scheduleDate = real.getScheduleDateStr();
 			String jGh = real.getjGh();
 			String jName = real.getjName();
 //			String sGh = real.getsGh();
 //			String sName = real.getsName();
 			String clZbh = real.getClZbh();
 			String lpName = real.getLpName();
-			Long bcsj = 0l;
+			Long bcsj_yy = 0l;
+			Long bcsj_ks = 0l;
 			if(getcTasks.isEmpty()){
 				if(!(real.isDestroy()) && real.getFcsjActual() != null && real.getZdsjActual() != null
 						&& real.getFcsjActual().trim().length() > 0 && real.getZdsjActual().trim().length() > 0
@@ -3625,7 +3673,12 @@ public class ReportServiceImpl implements ReportService{
 					if(zdsjT < fcsjT){
 						zdsjT += 1440l;
 					}
-					bcsj += zdsjT - fcsjT;
+					if("normal".equals(real.getBcType())){
+						bcsj_yy += zdsjT - fcsjT;
+					} else {
+						bcsj_ks += zdsjT - fcsjT;
+					}
+					
 				}
 			} else {
 				for(ChildTaskPlan task : getcTasks){
@@ -3639,19 +3692,23 @@ public class ReportServiceImpl implements ReportService{
 						if(zdsjT < fcsjT){
 							zdsjT += 1440l;
 						}
-						bcsj += zdsjT - fcsjT;
+						if(task.getMileageType().equals("service")){
+							bcsj_yy += zdsjT - fcsjT;
+						} else {
+							bcsj_ks += zdsjT - fcsjT;
+						}
 					}
 				}
 			}
-			String key = gsBm + "/" + fgsBm + "/" + xlBm + "/" + scheduleDate + "/"
+			String key = gsBm + "/" + fgsBm + "/" + xlBm + "/"
 						+ jGh + "/" + jName + "/" + clZbh + "/" + lpName;
 			if(!(keyMap.containsKey(key))){
 				Map<String, Object> m = new HashMap<String, Object>();
 				m.put("gsBm", gsBm);
 				m.put("fgsBm", fgsBm);
 				m.put("xlBm", xlBm);
-				m.put("date", scheduleDate);
+//				m.put("date", scheduleDate);
 				m.put("jGh", jGh);
 				m.put("jName", jName);
 //				m.put("sGh", sGh);
@@ -3659,11 +3716,13 @@ public class ReportServiceImpl implements ReportService{
 				m.put("clZbh", clZbh);
 				m.put("lpName", lpName);
 				m.put("jh", 0);
-				m.put("sj", 0);
+				m.put("sjyy", 0);
+				m.put("sjks", 0);
 				keyMap.put(key, m);
 			}
 			Map<String, Object> map = keyMap.get(key);
-			map.put("sj", bcsj + Long.valueOf(map.get("sj").toString()));
+			map.put("sjyy", bcsj_yy + Long.valueOf(map.get("sjyy").toString()));
+			map.put("sjks", bcsj_ks + Long.valueOf(map.get("sjks").toString()));
 		}
 		for(String key : keyMap.keySet()){
@@ -3689,9 +3748,16 @@ public class ReportServiceImpl implements ReportService{
 			map.put("xlName", xlName);
 			map.put("jsy", map.get("jGh").toString() + "/" + map.get("jName").toString());
 			Long jh = Long.valueOf(map.get("jh").toString());
-			Long sj = Long.valueOf(map.get("sj").toString());
+			Long sjyy = Long.valueOf(map.get("sjyy").toString());
+			Long sjks = Long.valueOf(map.get("sjks").toString());
 			map.put("jhTime", jh/60l + "." + (jh%60l>9?jh%60l:("0"+jh%60l)));
-			map.put("sjTime", sj/60l + "." + (sj%60l>9?sj%60l:("0"+sj%60l)));
+			map.put("sjyyTime", sjyy/60l + "." + (sjyy%60l>9?sjyy%60l:("0"+sjyy%60l)));
+			map.put("sjksTime", sjks/60l + "." + (sjks%60l>9?sjks%60l:("0"+sjks%60l)));
+			if(date.equals(date2)){
+				map.put("date", date);
+			} else {
+				map.put("date", date + "至" + date2);
+			}
 			resultList.add(map);
 		}
@@ -35,24 +35,28 @@
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 					</div>
-					<div style="display: inline-block;margin-left: 24px;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
-                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+                    <div style="display: inline-block;margin-left: 4px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 4px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
                     </div>
 					<div style="margin-top: 2px"></div>
-                    <div style="display: inline-block;margin-left: 33px;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+					<div style="display: inline-block;margin-left: 33px;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 28px;">
                         <span class="item-label" style="width: 80px;">工号: </span>
                         <input class="form-control" type="text" id="gh" style="width: 180px;"/>
                     </div>
-                    <div style="display: inline-block;margin-left: 24px;">
+                    <div style="display: inline-block;margin-left: 32px;">
                         <span class="item-label" style="width: 80px;">车辆: </span>
                         <input class="form-control" type="text" id="cl" style="width: 180px;"/>
                     </div>
-                    <div class="form-group" style="margin-left: 13px">
+                    <div class="form-group" style="margin-left: 10px">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
@@ -63,18 +67,19 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="9">工时统计表</th>
+								<th colspan="10">工时统计表</th>
 							</tr>
 							<tr>
-								<td>日期</td>
+								<td style="max-width: 160px;min-width: 160px">日期</td>
 								<td>公司</td>
 								<td>分公司</td>
 								<td>线路</td>
 								<td>路牌</td>
 								<td>驾驶员</td>
 								<td>车辆</td>
-								<td>计划工时(小时.分钟)</td>
-								<td>实际工时(小时.分钟)</td>
+								<td>计划工时<font style="font-size: 8px;color: gray;"> /小时.分钟</font></td>
+								<td>实际营运工时<font style="font-size: 8px;color: gray;"> /小时.分钟</font></td>
+								<td>实际空驶工时<font style="font-size: 8px;color: gray;"> /小时.分钟</font></td>
 							</tr>
 						</thead>
 						<tbody id="tbody">
@@ -104,11 +109,11 @@
 		if(day < 10)
 			day = "0" + day;
 		var dateTime = year + "-" + month + "-" + day;
-		$("#date").datetimepicker({
+		$("#date,#date2").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
-		$("#date").val(dateTime);
+		$("#date,#date2").val(dateTime);
 		var fage=false;
 		var xlList;
@@ -153,7 +158,7 @@
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -190,6 +195,7 @@
 	var line;
 	var date;
+	var date2;
 	var gsdm;
 	var fgsdm;
 	var gh;
@@ -200,15 +206,20 @@
 			layer.msg("请选择时间");
 			return;
 		}
+		if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+			layer.msg("请选择时间");
+			return;
+		}
 		line = $("#line").val();
 		date = $("#date").val();
+		date2 = $("#date2").val();
 		gsdm=$("#gsdm").val();
 		fgsdm=$("#fgsdm").val();
 		gh=$("#gh").val();
 		cl=$("#cl").val();
 		lineName=$("#select2-line-container").html();
 		var i = layer.load(2);
-		$post('/report/workingHours',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,gh:gh,cl:cl,lineName:lineName,type:'query'},function(result){
+		$post('/report/workingHours',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,gh:gh,cl:cl,lineName:lineName,type:'query'},function(result){
 			// 把数据填充到模版中
 			var tbodyHtml = template('workingHours',{list:result});
 			// 把渲染好的模版html文本追加到表格中
@@ -222,15 +233,20 @@
 			layer.msg("请选择时间");
 			return;
 		}
+		if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+			layer.msg("请选择时间");
+			return;
+		}
 		line = $("#line").val();
 		date = $("#date").val();
+		date2 = $("#date2").val();
 		gsdm=$("#gsdm").val();
 		fgsdm=$("#fgsdm").val();
 		gh=$("#gh").val();
 		cl=$("#cl").val();
 		lineName=$("#select2-line-container").html();
 		var i = layer.load(2);
-		$post('/report/workingHours',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,gh:gh,cl:cl,lineName:lineName,type:'export'},function(result){
+		$post('/report/workingHours',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,gh:gh,cl:cl,lineName:lineName,type:'export'},function(result){
 			window.open("/downloadFile/download?fileName="
 					+moment(date).format("YYYYMMDD")+"-"+lineName+"-工时统计表");
 			layer.close(i);
@@ -249,12 +265,13 @@
 			<td>{{obj.jsy}}</td>
 			<td>{{obj.clZbh}}</td>
 			<td>{{obj.jhTime}}</td>
-			<td>{{obj.sjTime}}</td>
+			<td>{{obj.sjyyTime}}</td>
+			<td>{{obj.sjksTime}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file