调度日报添加各种空驶公里列；统计日报标红逻辑改为以总公里计算且以日期划分；

娄高锋
1 parent 89f37220
Showing 5 changed files with 107 additions and 46 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/scheduleDaily.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
@@ -175,6 +175,10 @@ 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.xlBm = ?1 and s.scheduleDateStr = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm,s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
+	
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 order by s.xlBm,s.realExecDate,s.fcsj")
+	List<ScheduleRealInfo> scheduleByDateAndLine2_all(String line,String date);
 	//按月统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -2708,10 +2708,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> statisticsDaily(String line, String date,
                                                      String xlName, String type) {
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-        List<ScheduleRealInfo> list_s = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine2_all(line, date);
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
-        for (int i = 0; i < list_s.size(); i++) {
-            ScheduleRealInfo s = list_s.get(i);
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s = list.get(i);
             Set<ChildTaskPlan> cts = s.getcTasks();
             if (cts != null && cts.size() > 0) {
                 lists.add(s);
@@ -2723,33 +2723,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlName", xlName);
-        double jhlc = culateService.culateJhgl(list_s);
+        double jhlc = culateService.culateJhgl(list);
+        double jhkslc = culateService.culateJhJccgl(list); // //计划进出场公里(计划空驶公里)
+        double sjgl = Arith.add(culateService.culateSjgl(lists), culateService.culateLjgl(lists));
+        double sjjccgl = culateService.culateJccgl(lists);
+        double sjksgl = culateService.culateKsgl(lists);
+        double zksgl = Arith.add(sjjccgl, sjksgl);
         map.put("jhlc", jhlc);
-        map.put("sjgl", Arith.add(culateService.culateSjgl(lists), culateService.culateLjgl(lists)));
-        double lbgl = culateService.culateLbgl(list_s);
+        map.put("jhkslc", jhkslc);
+        map.put("jhzlc", Arith.add(jhlc, jhkslc));
+        map.put("sjgl", sjgl);
+        map.put("sjksgl", zksgl);
+        map.put("sjzgl", Arith.add(sjgl, zksgl));
+        double lbgl = culateService.culateLbgl(list);
+        double lbksgl = culateService.culateLbksgl(list);
         map.put("ssgl", lbgl);
-        map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
-        map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
-        map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
-        map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
-        map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
-        map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
-        map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
-        map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
-        map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
-        map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
-        map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "路救抛锚"));
-        double ssgl_pc = culateService.culateCJLC(list_s, "配车");
-        double ssgl_by = culateService.culateCJLC(list_s, "保养");
-        double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
-        double ssgl_qt = culateService.culateCJLC(list_s, "其他");
+        map.put("ssksgl", lbksgl); // 202508根据工单需求添加“少驶空驶公里”
+        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
+        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
+        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
+        map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
+        map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
+        map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
+        map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
+        map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
+        map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
+        map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
+        double ssgl_pc = culateService.culateCJLC(list, "配车");
+        double ssgl_by = culateService.culateCJLC(list, "保养");
+        double ssgl_cj = culateService.culateCJLC(list, "抽减");
+        double ssgl_qt = culateService.culateCJLC(list, "其他");
         map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
-        map.put("ssbc", culateService.culateLbbc(list_s));
+        map.put("ssbc", culateService.culateLbbc(list));
         double ljgl = culateService.culateLjgl(lists);
+        double ljks=culateService.culateLjksgl(lists);
+        double zrwJcc = culateService.culateZrwJccLc(lists, "all"); // 子任务进出场
+        double zrwKfks = culateService.culateZrwKfks(lists); // 子任务空放空驶
         map.put("ljgl", ljgl);
-        map.put("jhbc", culateService.culateJhbc(list_s, ""));
-        map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
-        map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
+        map.put("ljks", Arith.add(Arith.add(ljks, zrwJcc), zrwKfks)); // 202508根据工单需求添加“临加空驶”中而外算上子任务进出场公里。
+        map.put("jhbc", culateService.culateJhbc(list, ""));
+        map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
+        map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
         map.put("sjbc", culateService.culateSjbc(lists, ""));
         map.put("sjbc_m", culateService.culateSjbc(lists, "zgf"));
         map.put("sjbc_a", culateService.culateSjbc(lists, "wgf"));
@@ -2770,7 +2785,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("djg_a", c.getDjgWgf());
             map.put("djg_time", c.getDjgTime());
         }else{
-        	Map<String, Object> m = culateService.culateDjg(list_s, line);
+        	Map<String, Object> m = culateService.culateDjg(list, line);
             map.put("djg", m.get("djgcsq"));
             map.put("djg_m", m.get("djgcsz"));
             map.put("djg_a", m.get("djgcsw"));
@@ -2781,11 +2796,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         lMap.add(map);
         if (date.length() == 10) {
-            List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(line, date + "00:01", date + "23:59");
+            List<DutyEmployee> listDuty = dutyEmployeeService.getDutyEmployee(line, date + "00:01", date + "23:59");
             String dbdp = "";
             try {
-                for (int i = 0; i < list.size(); i++) {
-                    DutyEmployee t = list.get(i);
+                for (int i = 0; i < listDuty.size(); i++) {
+                    DutyEmployee t = listDuty.get(i);
                     if (dbdp.indexOf(t.getuName()) == -1) {
                         if (!(dbdp.length() > 0)) {
                             dbdp = t.getuName();
@@ -2910,9 +2925,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             double jhyygl = culateService.culateJhgl(list);//计划营运公里
             double jhjcclc = culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+            double jhzlc = Arith.add(jhyygl, jhjcclc);
             map.put("jhlc", jhyygl);
             map.put("jcclc", jhjcclc);
-            map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
+            map.put("jhzlc", jhzlc);
             double ljks=culateService.culateLjksgl(lists);
             double zrwJcc = culateService.culateZrwJccLc(lists, "all"); // 子任务进出场
             double zrwKfks = culateService.culateZrwKfks(lists); // 子任务空放空驶
@@ -2924,17 +2940,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             double sjjccgl = culateService.culateJccgl(lists);
             double sjksgl = culateService.culateKsgl(lists);
             double zksgl = Arith.add(sjjccgl, sjksgl);
-            map.put("sjzgl", Arith.add(zyygl, zksgl));
+            double sjzgl = Arith.add(zyygl, zksgl);
             map.put("sjgl", zyygl);
             map.put("sjksgl", zksgl);
+            map.put("sjzgl", sjzgl);
             double ssgl = culateService.culateLbgl(list);
             double ssksgl = culateService.culateLbksgl(list);
             map.put("ssgl", ssgl);
             map.put("ssksgl", ssksgl); // 202508根据工单需求添加“少驶空驶公里”
-            //计划+临加-少驶=实驶
-            double jl = Arith.sub(Arith.add(jhyygl, ljgl), ssgl);
-            if (jl == zyygl) {
+//            //计划+临加-少驶=实驶
+//            double jl = Arith.sub(Arith.add(jhyygl, ljgl), ssgl);
+//            if (jl == zyygl) {
+//                map.put("zt", 0);
+//            } else {
+//                map.put("zt", 1);
+//            }
+            double jl = Arith.sub(Arith.sub(Arith.add(Arith.add(jhzlc, ljgl), ljks), ssgl), ssksgl); // 202508工单需求，以总公里和日期计算是否标红。
+            if (jl == sjzgl) {
                 map.put("zt", 0);
             } else {
                 map.put("zt", 1);
@@ -3306,9 +3329,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("gsName", "");
         double jhyygl = culateService.culateJhgl(list);//计划营运公里
         double jhjcclc = culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+        double jhzlc = Arith.add(jhyygl, jhjcclc);
         map.put("jhlc", jhyygl);
         map.put("jcclc", jhjcclc);
-        map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
+        map.put("jhzlc", jhzlc);
         double ljgl = culateService.culateLjgl(list_s);
         double sjyygl = culateService.culateSjgl(list_s);
@@ -3320,17 +3344,25 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double sjjccgl = culateService.culateJccgl(list_s);
         double sjksgl = culateService.culateKsgl(list_s);
         double zksgl = Arith.add(sjjccgl, sjksgl);
-        map.put("sjzgl", Arith.add(zyygl, zksgl));
+        double sjzgl = Arith.add(zyygl, zksgl);
         map.put("sjgl", zyygl);
         map.put("sjksgl", zksgl);
+        map.put("sjzgl", sjzgl);
         double ssgl = culateService.culateLbgl(list);
         double ssksgl = culateService.culateLbksgl(list);
         map.put("ssgl", ssgl);
         map.put("ssksgl", ssksgl); // 202508根据工单需求添加“少驶空驶公里”
-        //计划+临加-少驶=实驶
-        double jl = Arith.sub(Arith.add(jhyygl, ljgl), ssgl);
-        if (jl == zyygl) {
+//        //计划营运+临加营运-少驶营运=实驶营运
+//        double jl = Arith.sub(Arith.add(jhyygl, ljgl), ssgl);
+//        if (jl == zyygl) {
+//            map.put("zt", 0);
+//        } else {
+//            map.put("zt", 1);
+//        }
+        //计划总公里+临加总公里-少驶总公里=实驶总公里
+        double jl = Arith.sub(Arith.sub(Arith.add(Arith.add(jhzlc, ljgl), ljks), ssgl), ssksgl); // 202508工单需求，以总公里和日期计算是否标红。
+        if (jl == sjzgl) {
             map.put("zt", 0);
         } else {
             map.put("zt", 1);
@@ -3401,6 +3433,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         lMap.add(map);
+        for(Map<String, Object> m : lMap){
+        	m.put("startDate", date);
+        	m.put("endDate", date2);
+        }
+        
         if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -66,21 +66,21 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="41"><label id="xlmc"></label>线路调度日报</th>
+								<th colspan="45"><label id="xlmc"></label>线路调度日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span>路线</span></td>
-								<td colspan="17">全日营运里程（公里）</td>
+								<td colspan="21">全日营运里程（公里）</td>
 								<td colspan="15">全日营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
-								<td rowspan="2"><span >计划</span></td>
-								<td rowspan="2"><span >实驶</span></td>
-								<td rowspan="2"><span>少驶公里</span></td>
+								<td colspan="2"><span>计划公里</span></td>
+								<td colspan="2"><span>实驶公里</span></td>
+								<td colspan="2"><span>少驶公里</span></td>
 								<td rowspan="2"><span>少驶班次</span></td>
 								<td colspan="12">少驶原因（公里）</td>
-								<td rowspan="2"><span >临加公里</span></td>
+								<td colspan="2"><span >临加公里</span></td>
 								<td colspan="3">计划班次</td>
 								<td colspan="3">实际班次</td>
 								<td colspan="3">临加班次</td>
@@ -91,6 +91,12 @@
 								<td colspan="5" rowspan="2">原因</td>
 							</tr>
 							<tr>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
 								<td><span>路阻</span></td>
 								<td><span>吊慢</span></td>
 								<td><span>故障</span></td>
@@ -103,6 +109,8 @@
 								<td><span>援外</span></td>
 								<td><span>路救抛锚</span></td>
 								<td><span>其他</span></td>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
 								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
@@ -530,8 +538,11 @@
 		<tr >
 			<td>{{obj.xlName}}</td>
 			<td>{{obj.jhlc}}</td>
+			<td>{{obj.jhkslc}}</td>
 			<td>{{obj.sjgl}}</td>
+			<td>{{obj.sjksgl}}</td>
 			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssksgl}}</td>
 			<td>{{obj.ssbc}}</td>
 			<td>{{obj.ssgl_lz}}</td>
 			<td>{{obj.ssgl_dm}}</td>
@@ -546,6 +557,7 @@
 			<td>{{obj.ssgl_ljpm}}</td>
 			<td>{{obj.ssgl_other}}</td>
 			<td>{{obj.ljgl}}</td>
+			<td>{{obj.ljks}}</td>
 			<td>{{obj.jhbc}}</td>
 			<td>{{obj.jhbc_m}}</td>
 			<td>{{obj.jhbc_a}}</td>
@@ -570,7 +582,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="41"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="45"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -328,6 +328,14 @@
 					 params['type'] = "query";
 					var i = layer.load(2);
 					$get('/realSchedule/statisticsDailyTj',params,function(result){
+						
+						$.each(result, function(i, e){
+							console.log(e);
+							if(e && e.startDate && e.startDate >= '2025-09-20'){
+								e.zt = 0; // 要求从更新后开始的数据才标红。
+							}
+						});
+						
 						// 把数据填充到模版中
 						var tbodyHtml = template('statisticsDaily',{list:result});
 						// 把渲染好的模版html文本追加到表格中