工作汇总，日报表，月报表。。。

廖磊
1 parent f82abec7
Showing 8 changed files with 134 additions and 26 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/util/ComparableJob.java
src/main/resources/static/pages/forms/statement/jobSummary.html
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/mforms/shifdays/shifday.html
@@ -219,13 +219,11 @@ public class FormsServiceImpl implements FormsService {
 //				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
 //					sList.add(s);
 //				}
-				
 				if(empnames.equals("驾驶员")){
-					if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+					if(d.getJgh().equals(s.getjGh())){
 						sList.add(s);
 					}
 				}else if(empnames.equals("售票员")){
-//					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name")); 
 					String sgh=s.getsGh()==null?"":s.getsGh();
 					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
 						sList.add(s);
@@ -244,16 +242,17 @@ public class FormsServiceImpl implements FormsService {
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
 			double zyygl=Arith.add(ljgl, sjgl);
-			double cjbc=culateMileageService.culateLbbc(sList);
-			double Ljbc=culateMileageService.culateLjbc(sList,"");
+			int cjbc=culateMileageService.culateLbbc(sList);
+			int ljbc=culateMileageService.culateLjbc(sList,"");
+			int sjbc=culateMileageService.culateSjbc(sList, "");
 			double cjgl=culateMileageService.culateLbgl(sList);
 			double zjgl=culateMileageService.culateLjgl(sList);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
-			d.setSjbc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setSjbc(String.valueOf(sjbc+ljbc));
 			d.setJhlc(String.valueOf(zyygl));//运营里程
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
-			d.setLjbc(String.valueOf(Ljbc));//增加班次
+			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setRemMileage(String.valueOf(cjgl));//抽检里程
 			d.setAddMileage(String.valueOf(zjgl));//增加里程
@@ -330,22 +329,23 @@ public class FormsServiceImpl implements FormsService {
 			double zyygl=Arith.add(ljgl, sjgl);
 			double jhgl=culateMileageService.culateJhgl(sList);
 			double cjgl=culateMileageService.culateLbgl(sList);
-			double jhbc	=culateMileageService.culateJhbc(sList,"");
-			double cjbc=culateMileageService.culateLbbc(sList);
-			double Ljbc=culateMileageService.culateLjbc(sList,"");
+			int jhbc	=culateMileageService.culateJhbc(sList,"");
+			int cjbc=culateMileageService.culateLbbc(sList);
+			int ljbc=culateMileageService.culateLjbc(sList,"");
+			int sjbc=culateMileageService.culateSjbc(sList, "");
 			double zjgl=culateMileageService.culateLjgl(sList);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
-			d.setSjbc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setSjbc(String.valueOf(sjbc+ljbc));
 			d.setJhlc(String.valueOf(jhgl));//计划里程
 			d.setYygl(String.valueOf(zyygl));//运营公里
 			d.setSjjhlc(String.valueOf(sjgl));//实际计划里程
 			d.setRemMileage(String.valueOf(cjgl));//抽减里程
 			d.setJhbc(String.valueOf(jhbc));//计划班次
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
-			d.setLjbc(String.valueOf(Ljbc));//增加班次
+			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setAddMileage(String.valueOf(zjgl));//增加公里
-			d.setSjjhbc(String.valueOf(culateMileageService.culateSjbc(sList, "")));//实际计划班次
+			d.setSjjhbc(String.valueOf(sjbc));//实际计划班次
 			}
 		return list;
 	}
@@ -501,7 +501,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 + " from bsth_c_s_sp_info_real s "
                 + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
                 + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
-                + " order by (" + state + "),schedule_date_str,fcsj " + type;
+                + " order by (" + state + "),dateStr,fcsj " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
                     @Override
@@ -1394,7 +1394,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     			lists.add(s);
     		}
 		}
-    	double ksgl=culateService.culateKsgl(lists);
+    	double ksgl=culateService.culateKsgl(list);
     	double sjgl=culateService.culateSjgl(lists);
     	double jccgl=culateService.culateJccgl(lists);
     	double ljgl=culateService.culateLjgl(lists);
 package com.bsth.service.report.impl;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -14,6 +15,7 @@ import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableJob;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
@@ -25,6 +27,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
+		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = lists.get(i);
@@ -47,7 +50,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
-						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
+						newMap.put("lblc", scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
 						list.add(newMap);
 					}
@@ -71,7 +74,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							newMap.put("dz", childTaskPlan.getStartStationName());
 							newMap.put("sj", childTaskPlan.getStartDate());
 							newMap.put("lbbc", 0);
-							newMap.put("lblc", childTaskPlan.getMileage());
+							newMap.put("lblc", childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 							newMap.put("jyqp", scheduleRealInfo.getRealMileage());
 							list.add(newMap);
@@ -80,7 +83,33 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				}
 			}
 		}
-		return list;
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		for (int i = 0; i < lblxs.length; i++) {
+			 String lx=lblxs[i];
+			 double lblc=0.0;
+			 int lbbc=0;
+			 for (int j = 0; j < list.size(); j++) {
+				Map<String, Object> m1=list.get(j);
+				m1.put("lx", 0);
+				listNew.add(m1);
+				if(lx.equals(m1.get("nr").toString())){
+					lblc =Arith.add(lblc,Double.parseDouble(m1.get("lblc").toString()));
+					lbbc += Integer.parseInt(m1.get("lbbc").toString());
+				}
+			}
+			 Map<String, Object> newMap = new HashMap<String, Object>();
+			 newMap.put("lx", 1);
+		 	 newMap.put("nr", lx);
+			 newMap.put("lp", "小计");
+			 newMap.put("nbbm", "少驶公里");
+			 newMap.put("dz", lbbc);
+			 newMap.put("sj", "少驶公里");
+			 newMap.put("lblc", lblc);
+			 listNew.add(newMap);
+			 
+		}
+		Collections.sort(listNew, new ComparableJob());
+		return listNew;
 	}
 	@Override
@@ -8,6 +8,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,6 +39,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableJob;
 import com.bsth.util.db.DBUtils_MS;
 @Service
@@ -1150,6 +1152,7 @@ public class ReportServiceImpl implements ReportService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		map.put("bcType", "normal");
@@ -1179,7 +1182,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
 						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+						newMap.put("jyqp", scheduleRealInfo.getRemarks());
 						list.add(newMap);
 					}
@@ -1205,7 +1208,7 @@ public class ReportServiceImpl implements ReportService{
 							newMap.put("sj", childTaskPlan.getStartDate());
 							newMap.put("lbbc", 0);
 							newMap.put("lblc", childTaskPlan.getMileage());
-							newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+							newMap.put("jyqp", childTaskPlan.getRemarks());
 							list.add(newMap);
 						}
@@ -1213,7 +1216,36 @@ public class ReportServiceImpl implements ReportService{
 				}
 			}
 		}
-		return list;
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		for (int i = 0; i < lblxs.length; i++) {
+			 String lx=lblxs[i];
+			 double lblc=0.0;
+			 int lbbc=0;
+			 for (int j = 0; j < list.size(); j++) {
+				Map<String, Object> m1=list.get(j);
+				if(lx.equals(m1.get("nr").toString())){
+					m1.put("lx", 0);
+					listNew.add(m1);
+					lblc =Arith.add(lblc,Double.parseDouble(m1.get("lblc").toString()));
+					lbbc += Integer.parseInt(m1.get("lbbc").toString());
+				}
+			}
+			 if(lblc>0){
+				 Map<String, Object> newMap = new HashMap<String, Object>();
+				 newMap.put("lx", 1);
+			 	 newMap.put("nr", lx);
+				 newMap.put("lp", "小计");
+				 newMap.put("nbbm", "少驶班次");
+				 newMap.put("jgh", lbbc);
+				 newMap.put("sj", "少驶公里");
+				 newMap.put("lblc", lblc);
+				 listNew.add(newMap);
+			 }
+			
+			 
+		}
+		Collections.sort(listNew, new ComparableJob());
+		return listNew;
 	}
 		//统计临加班次详细信息
+package com.bsth.util;
+
+import java.util.Comparator;
+import java.util.Map;
+
+
+public class ComparableJob implements Comparator<Map<String, Object>>{
+
+	@Override
+	public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+		// TODO Auto-generated method stub
+		return o1.get("nr").toString().compareTo(o2.get("nr").toString());
+	}
+
+}
@@ -277,6 +277,27 @@
 			initPinYinSelect2('#line',data,'');
 		}) */
+		
+		jQuery.fn.rowspan = function(colIdx) { //封装的一个JQuery小插件
+		      return this.each(function(){
+		         var that;
+		         $('tr', this).each(function(row) {
+		            $('td:eq('+colIdx+')', this).filter(':visible').each(function(col) {
+		               if (that!=null && $(this).html() == $(that).html()) {
+		                  rowspan = $(that).attr("rowSpan");
+		                  if (rowspan == undefined) {
+		                     $(that).attr("rowSpan",1);
+		                     rowspan = $(that).attr("rowSpan"); }
+		                  rowspan = Number(rowspan)+1;
+		                  $(that).attr("rowSpan",rowspan);
+		                  $(this).hide();
+		               } else {
+		                  that = this;
+		               }
+		            });
+		         });
+		      });
+		   }
 		$("#query").on("click",function(){
 			var line=$("#line").val();;
 			var lineName=$(".select2-selection__rendered").html();
@@ -292,6 +313,11 @@
 					 var list_lbqk = template('list_lbqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#forms .list_lbqk').html(list_lbqk);
+						$('#forms .list_lbqk').rowspan(0);
+						$('#forms .list_lbqk').rowspan(1);
+						$('#forms .list_lbqk').rowspan(2);
+						$('#forms .list_lbqk').rowspan(3);
+						
 				})
 				$get('/report/jobLjqk',{line:line,date:date},function(result){
@@ -328,13 +354,19 @@
 			<td>{{obj.nr}}</td>
 			<td>{{obj.lp}}</td>
 			<td>{{obj.nbbm}}</td>
-			<td>{{obj.jgh}}</td>
+			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.jgh}}</td>
+ 				{{if obj.lx ==0}}
 			<td>{{obj.dz}}</td>
-			<td>{{obj.sj}}</td>
+				{{/if}}
+			<td {{if obj.lx ==1}} colspan="3" {{/if}}>{{obj.sj}}</td>
+				{{if obj.lx ==0}}
 			<td>&nbsp;</td>
 			<td>{{obj.lbbc}}</td>
-			<td>{{obj.lblc}}</td>
+				{{/if}}
+			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.lblc}}</td>
+				{{if obj.lx ==0}}
 			<td>{{obj.jyqp}}</td>
+				{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -551,7 +551,7 @@ letter-spacing: 20px;
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td>{{obj.fcsjActual}}
+				<td style="word-break: keep-all;white-space:nowrap;">{{obj.fcsjActual}}
 				{{if obj.bcType== "in"}}
 						(进)
 					{{/if}}
@@ -71,7 +71,7 @@
 								<th>车辆</th>
 								<th>计划里程</th>
 								<th>实际计划里程</th>
-								<th>运营</th>
+								<th>运营里程</th>
 								<th>空驶里程</th>
 								<th>抽减里程</th>
 								<th>增加里程</th>