工作汇总

廖磊
1 parent c22797cf
Showing 4 changed files with 76 additions and 33 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/jobSummary.xls
src/main/resources/static/pages/forms/statement/jobSummary.html
@@ -51,6 +51,7 @@ public class ReportController {
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
 			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			resList.add(m);
 			i++;
 		}
@@ -66,41 +67,61 @@ public class ReportController {
 		return resList;
 	}
+	
 	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
 	}
-	@RequestMapping(value="/exportQueryListClzd" ,method = RequestMethod.GET)
-	public List<Map<String, Object>> exportQueryListClzd(@RequestParam String zd,@RequestParam String line,
-			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+	
+	
+	
+	@RequestMapping(value="/jobSummaryExport" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> jobSummaryExport(@RequestParam Map<String, Object> map){
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		String lineName=map.get("lineName").toString();
+		String date=map.get("date").toString();
 		ReportUtils ee = new ReportUtils();
-		List<ArrivalInfo> list=service.queryListClzd(line, zd, zdlx, fcsj, ddsj);
-		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		int i=1;
-		for (ArrivalInfo a:list ) {
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("i", i);
-			m.put("nbbm", a.getNbbm());
-			m.put("stopName", a.getStopName());
-			m.put("jzsj", a.getJzsj());
-			m.put("czsj", a.getCzsj());
-			m.put("upDown", a.getUpDown()==0?"上行":"下行");
-			i++;
+		 List<Map<String,Object>> fwqlList= service.jobFwqk(map);
+		 List<Map<String, Object>> lgqlList=service.jobLjqk(map);
+		 map=service.jobHzxx(map);
+		 map.put("lineName", lineName);
+		 map.put("date",date);
+		 if(fwqlList.size()<=0){
+			 Map<String, Object> newMap=new HashMap<String,Object>();
+			 	newMap.put("nr", " ");
+				newMap.put("lp", " ");
+				newMap.put("nbbm", " ");
+				newMap.put("jgh", " ");
+				newMap.put("dz", " ");
+				newMap.put("sj", " ");
+				newMap.put("lbbc", " ");
+				newMap.put("lblc", " ");
+				newMap.put("jyqp", " ");
+				fwqlList.add(newMap);
+		 }
+		if(lgqlList.size()<=0){
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			newMap.put("lp", " ");
+			newMap.put("nbbm", " ");
+			newMap.put("jgh", " ");
+			newMap.put("dz", " ");
+			newMap.put("sj", " ");
+			newMap.put("ljlc"," ");
+			newMap.put("jyqp", " ");
+			lgqlList.add(newMap);
 		}
-		
 		try {
-			Map<String, Object> map=new HashMap<String, Object>();
-			listI.add(resList.iterator());
+			listI.add(fwqlList.iterator());
+			listI.add(lgqlList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
-					path + "export/班次到离站.xls");
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/jobSummary.xls",
+					path + "export/调度员工作汇总日报.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return resList;
+		return new ArrayList<Map<String, Object>>();
 	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
@@ -1181,6 +1181,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
+						newMap.put("gzf", " ");
 						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
 						newMap.put("jyqp", scheduleRealInfo.getRemarks());
 						list.add(newMap);
@@ -1206,6 +1207,7 @@ public class ReportServiceImpl implements ReportService{
 							newMap.put("jgh", scheduleRealInfo.getjGh());
 							newMap.put("dz", childTaskPlan.getStartStationName());
 							newMap.put("sj", childTaskPlan.getStartDate());
+							newMap.put("gzf", " ");
 							newMap.put("lbbc", 0);
 							newMap.put("lblc", childTaskPlan.getMileage());
 							newMap.put("jyqp", childTaskPlan.getRemarks());
@@ -1237,8 +1239,12 @@ public class ReportServiceImpl implements ReportService{
 				 newMap.put("lp", "小计");
 				 newMap.put("nbbm", "少驶班次");
 				 newMap.put("jgh", lbbc);
-				 newMap.put("sj", "少驶公里");
+				 newMap.put("lbbc", "少驶公里");
 				 newMap.put("lblc", lblc);
+				 newMap.put("dz", " ");
+				 newMap.put("sj", " ");
+				 newMap.put("gzf", " ");
+				 newMap.put("jyqp"," ");
 				 listNew.add(newMap);
 			 }
@@ -1271,7 +1277,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("ljlc", scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+						newMap.put("jyqp", scheduleRealInfo.getRealMileage()==null?"":scheduleRealInfo.getRealMileage());
 						list.add(newMap);
 					}
 //				}else{
@@ -46,7 +46,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
@@ -298,10 +298,12 @@
 		         });
 		      });
 		   }
+		$('#export').attr('disabled', "true");
 		$("#query").on("click",function(){
-			var line=$("#line").val();;
+			var line=$("#line").val();
 			var lineName=$(".select2-selection__rendered").html();
 			var date =$("#date").val();
+			$("#export").removeAttr("disabled");
 			if(line=="" || line==null){
 				  layer.msg('请选择线路.');
 			}else if(date==""||date==null){
@@ -310,6 +312,7 @@
 				$("#xlid").html(lineName);
 				$("#dateid").html(date);
 				$get('/report/jobFwqk',{line:line,date:date},function(result){
+					console.log(result);
 					 var list_lbqk = template('list_lbqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#forms .list_lbqk').html(list_lbqk);
@@ -344,7 +347,22 @@
 			}
-		})
+		});
+		
+		$("#export").on("click",function(){
+			var line=$("#line").val();
+			var lineName=$(".select2-selection__rendered").html();
+			var date =$("#date").val();
+			if(line=="" || line==null){
+				  layer.msg('请选择线路.');
+			}else if(date==""||date==null){
+				  layer.msg('请选择日期.');
+			}else{
+				$get('/report/jobSummaryExport',{line:line,date:date,lineName:lineName},function(result){
+					window.open("/downloadFile/download?fileName=调度员工作汇总日报");
+				});
+			}
+		});
 	});
 </script>
@@ -354,15 +372,13 @@
 			<td>{{obj.nr}}</td>
 			<td>{{obj.lp}}</td>
 			<td>{{obj.nbbm}}</td>
-			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.jgh}}</td>
+			<td {{if obj.lx ==1}} colspan="4" {{/if}}>{{obj.jgh}}</td>
  				{{if obj.lx ==0}}
-			<td>{{obj.dz}}</td>
-				{{/if}}
-			<td {{if obj.lx ==1}} colspan="3" {{/if}}>{{obj.sj}}</td>
-				{{if obj.lx ==0}}
-			<td>&nbsp;</td>
+			     <td>{{obj.dz}}</td>
+			     <td>{{obj.sj}}</td>
+			     <td>&nbsp;</td>
+			{{/if}}
 			<td>{{obj.lbbc}}</td>
-				{{/if}}
 			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.lblc}}</td>
 				{{if obj.lx ==0}}
 			<td>{{obj.jyqp}}</td>