Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

王通
2 parents 49c1c73d 4f683c49
Showing 4 changed files with 42 additions and 43 deletions
src/main/java/com/bsth/controller/report/ReportController.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/statement/workingHours.html
@@ -367,8 +367,8 @@ 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 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);
+			@RequestParam String cl, @RequestParam String lpName, @RequestParam String lineName, @RequestParam String type){
+		List<Map<String, Object>> list = service.workingHours(gsdm, fgsdm, line, date, date2, gh, cl, lpName);
 		if("export".equals(type)){
 			try {
 				ReportUtils ee = new ReportUtils();
@@ -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 date2, String gh, String cl);
+	 List<Map<String, Object>> workingHours(String gsdm, String fgsdm, String line, String date, String date2, String gh, String cl, String lpName);
  }
@@ -3556,7 +3556,7 @@ public class ReportServiceImpl implements ReportService{
 	@Override
 	public List<Map<String, Object>> workingHours(String gsdm, String fgsdm, String line, String date, String date2,
-			String gh, String cl) {
+			String gh, String cl, String lp) {
 		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -3572,40 +3572,6 @@ public class ReportServiceImpl implements ReportService{
 		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 + "/"
-//						+ 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();
@@ -3722,6 +3688,15 @@ public class ReportServiceImpl implements ReportService{
 			map.put("sjks", bcsj_ks + Long.valueOf(map.get("sjks").toString()));
 		}
+		Map<String, Object> sumMap = new HashMap<String, Object>();
+		sumMap.put("date", "小计");
+		sumMap.put("gsName", "");
+		sumMap.put("fgsName", "");
+		sumMap.put("xlName", "");
+		sumMap.put("lpName", "");
+		sumMap.put("jsy", "");
+		sumMap.put("clZbh", "");
+		Long jh_sum = 0l, sjyy_sum = 0l, sjks_sum = 0l;
 		for(String key : keyMap.keySet()){
 			Map<String, Object> map = keyMap.get(key);
 			if(gh.trim().length() > 0){
@@ -3734,6 +3709,11 @@ public class ReportServiceImpl implements ReportService{
 					continue;
 				}
 			}
+			if(lp.trim().length() > 0){
+				if(!(map.get("lpName").toString().toLowerCase().contains(lp.toLowerCase()))){
+					continue;
+				}
+			}
 			String gsBm = map.get("gsBm").toString();
 			String fgsBm = map.get("fgsBm").toString();
 			String xlBm = map.get("xlBm").toString();
@@ -3747,17 +3727,26 @@ public class ReportServiceImpl implements ReportService{
 			Long jh = Long.valueOf(map.get("jh").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("sjyyTime", sjyy/60l + "." + (sjyy%60l>9?sjyy%60l:("0"+sjyy%60l)));
-			map.put("sjksTime", sjks/60l + "." + (sjks%60l>9?sjks%60l:("0"+sjks%60l)));
+			map.put("jhTime", jh > 0l ? jh/60l + "." + (jh%60l>9?jh%60l:("0"+jh%60l)) : "0.0");
+			map.put("sjyyTime", sjyy > 0l ? sjyy/60l + "." + (sjyy%60l>9?sjyy%60l:("0"+sjyy%60l)) : "0.0");
+			map.put("sjksTime", sjks > 0l ? sjks/60l + "." + (sjks%60l>9?sjks%60l:("0"+sjks%60l)) : "0.0");
 			if(date.equals(date2)){
 				map.put("date", date);
 			} else {
 				map.put("date", date + "至" + date2);
 			}
+			
+			jh_sum += jh;
+			sjyy_sum += sjyy;
+			sjks_sum += sjks;
+			
 			resultList.add(map);
 		}
+		sumMap.put("jhTime", jh_sum > 0l ? jh_sum/60l + "." + (jh_sum%60l>9?jh_sum%60l:("0"+jh_sum%60l)) : "0.0");
+		sumMap.put("sjyyTime", sjyy_sum > 0l ? sjyy_sum/60l + "." + (sjyy_sum%60l>9?sjyy_sum%60l:("0"+sjyy_sum%60l)) : "0.0");
+		sumMap.put("sjksTime", sjks_sum > 0l ? sjks_sum/60l + "." + (sjks_sum%60l>9?sjks_sum%60l:("0"+sjks_sum%60l)) : "0.0");
+		
 		Collections.sort(resultList, new Comparator<Map<String, Object>>() {
 			@Override
 			public int compare(Map<String, Object> c1, Map<String, Object> c2) {
@@ -3805,6 +3794,9 @@ public class ReportServiceImpl implements ReportService{
 			}
 		});
+		//小计，排序结束后再插入
+		resultList.add(sumMap);
+		
 		return resultList;
 	}
@@ -56,6 +56,10 @@
                         <span class="item-label" style="width: 80px;">车辆: </span>
                         <input class="form-control" type="text" id="cl" style="width: 180px;"/>
                     </div>
+                    <div style="display: inline-block;margin-left: 32px;">
+                        <span class="item-label" style="width: 80px;">路牌: </span>
+                        <input class="form-control" type="text" id="lpName" style="width: 180px;"/>
+                    </div>
                     <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="导出"/>
@@ -200,6 +204,7 @@
 	var fgsdm;
 	var gh;
 	var cl;
+	var lpName;
 	var lineName=$("#select2-line-container").html();
 	$("#query").on("click",function(){
 		if($("#date").val() == null || $("#date").val().trim().length == 0){
@@ -217,9 +222,10 @@
 		fgsdm=$("#fgsdm").val();
 		gh=$("#gh").val();
 		cl=$("#cl").val();
+		lpName=$("#lpName").val();
 		lineName=$("#select2-line-container").html();
 		var i = layer.load(2);
-		$post('/report/workingHours',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,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,lpName:lpName,lineName:lineName,type:'query'},function(result){
 			// 把数据填充到模版中
 			var tbodyHtml = template('workingHours',{list:result});
 			// 把渲染好的模版html文本追加到表格中
@@ -244,9 +250,10 @@
 		fgsdm=$("#fgsdm").val();
 		gh=$("#gh").val();
 		cl=$("#cl").val();
+		lpName=$("#lpName").val();
 		lineName=$("#select2-line-container").html();
 		var i = layer.load(2);
-		$post('/report/workingHours',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,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,lpName:lpName,lineName:lineName,type:'export'},function(result){
 			window.open("/downloadFile/download?fileName="
 					+moment(date).format("YYYYMMDD")+"-"+lineName+"-工时统计表");
 			layer.close(i);