闵行工时统计表添加线路小计。

娄高锋
1 parent a9757024
Showing 2 changed files with 65 additions and 11 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/statement/workingHours.html
@@ -3571,6 +3571,7 @@ public class ReportServiceImpl implements ReportService{
 			realList = scheduleRealInfoRepository.scheduleByDates(date, date2, gsdm, fgsdm);
 		}
+		Map<String, Map<String, Object>> lineSumMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		for(ScheduleRealInfo plan : realList){
@@ -3690,7 +3691,7 @@ public class ReportServiceImpl implements ReportService{
 		}
 		Map<String, Object> sumMap = new HashMap<String, Object>();
-		sumMap.put("date", "小计");
+		sumMap.put("date", "合计");
 		sumMap.put("gsName", "");
 		sumMap.put("fgsName", "");
 		sumMap.put("xlName", "");
@@ -3731,11 +3732,37 @@ public class ReportServiceImpl implements ReportService{
 			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");
+			String dateStr = date;
 			if(date.equals(date2)){
-				map.put("date", date);
+				dateStr = date;
 			} else {
-				map.put("date", date + "至" + date2);
+				dateStr = date + "至" + date2;
 			}
+			map.put("date", dateStr);
+			
+			if(!(lineSumMap.containsKey(xlName))){ // 线路小计
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("date", dateStr);
+				m.put("gsBm", gsBm);
+				m.put("fgsBm", fgsBm);
+				m.put("xlBm", xlBm);
+				m.put("gsName", gsName);
+				m.put("fgsName", fgsName);
+				m.put("xlName", xlName);
+				m.put("lpName", "小计");
+				m.put("jGh", "");
+				m.put("jName", "");
+				m.put("jsy", "");
+				m.put("clZbh", "");
+				m.put("jh", 0);
+				m.put("sjyy", 0);
+				m.put("sjks", 0);
+				lineSumMap.put(xlName, m);
+			}
+			Map<String, Object> lineSum = lineSumMap.get(xlName);
+			lineSum.put("jh", jh + Long.valueOf(lineSum.get("jh").toString()));
+			lineSum.put("sjyy", sjyy + Long.valueOf(lineSum.get("sjyy").toString()));
+			lineSum.put("sjks", sjks + Long.valueOf(lineSum.get("sjks").toString()));
 			jh_sum += jh;
 			sjyy_sum += sjyy;
@@ -3748,6 +3775,19 @@ public class ReportServiceImpl implements ReportService{
 		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");
+		for(String key : lineSumMap.keySet()){ // 线路小计
+			Map<String, Object> map = lineSumMap.get(key);
+			
+			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 > 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");
+			
+			resultList.add(map);
+		}
+		
 		Collections.sort(resultList, new Comparator<Map<String, Object>>() {
 			@Override
 			public int compare(Map<String, Object> c1, Map<String, Object> c2) {
@@ -3777,6 +3817,12 @@ public class ReportServiceImpl implements ReportService{
 				}
 				String lpName1 = c1.get("lpName").toString();
 				String lpName2 = c2.get("lpName").toString();
+				/** 固定把线路小计排在自己线路数据的最后面 */
+				if("小计".equals(lpName1)){
+					return 1;
+				} else if("小计".equals(lpName2)){
+					return -1;
+				}
 				int compare2 = Collator.getInstance(Locale.CHINESE).compare(lpName1, lpName2);
 				if (compare2 > 0) {
 					return 1;
@@ -272,14 +272,22 @@
 </script>
 <script type="text/html" id="workingHours">
 	{{each list as obj i}}
-		<tr>
-			<td>{{obj.date}}</td>
-			<td>{{obj.gsName}}</td>
-			<td>{{obj.fgsName}}</td>
-			<td>{{obj.xlName}}</td>
-			<td>{{obj.lpName}}</td>
-			<td>{{obj.jsy}}</td>
-			<td>{{obj.clZbh}}</td>
+		<tr>
+			{{if obj.date == '合计' || obj.date == '小计'}}
+				<td colspan="7" style="font-weight: 900;">{{obj.date}}</td>
+			{{else}}
+				<td>{{obj.date}}</td>
+				<td>{{obj.gsName}}</td>
+				<td>{{obj.fgsName}}</td>
+				<td>{{obj.xlName}}</td>
+				{{if obj.lpName == '小计'}}
+					<td colspan="3" style="font-weight: 900;text-align: center;">{{obj.lpName}}</td>
+				{{else}}
+					<td>{{obj.lpName}}</td>
+					<td>{{obj.jsy}}</td>
+					<td>{{obj.clZbh}}</td>
+				{{/if}}
+			{{/if}}
 			<td>{{obj.jhTime}}</td>
 			<td>{{obj.sjyyTime}}</td>
 			<td>{{obj.sjksTime}}</td>