潘钊 / bsth_control · Commits

Commit a99a61f58f6eec7106abbf9f0f5c13112034ae15

Authored by zq
2 parents abb0cfd1 9a37f81a
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control.git into minhang

Inline Side-by-side
Showing 7 changed files with 365 additions and 88 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @a99a61f
@@ -20,7 +20,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI @@ -20,7 +20,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
20 List<ScheduleRealInfo> findByLines(List<String> lines); 20 List<ScheduleRealInfo> findByLines(List<String> lines);
21 21
22 22
23 - @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType = 'out' order by (lpName+1)") 23 + @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName order by (lpName+1)")
24 List<ScheduleRealInfo> queryUserInfo(String line,String date); 24 List<ScheduleRealInfo> queryUserInfo(String line,String date);
25 25
26 @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs") 26 @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
@@ -29,7 +29,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI @@ -29,7 +29,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
29 @Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh") 29 @Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
30 List<Map<String, Object>> dailyInfo(String line,String date); 30 List<Map<String, Object>> dailyInfo(String line,String date);
31 31
32 - @Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm = ?1 AND r.schedule_date = ?2 and r.cl_zbh = ?3",nativeQuery=true) 32 + @Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm = ?1 AND r.schedule_date = ?2 and r.cl_zbh = ?3 order by d.timestamp",nativeQuery=true)
33 List<Object[]> historyMessage(String line,String date,String code); 33 List<Object[]> historyMessage(String line,String date,String code);
34 34
35 @Query(value = "select max(id) from ScheduleRealInfo") 35 @Query(value = "select max(id) from ScheduleRealInfo")
@@ -54,7 +54,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI @@ -54,7 +54,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
54 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj") 54 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj")
55 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName); 55 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName);
56 56
57 - @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate <= str_to_date(?4,'%Y-%m-%d') order by bcs") 57 + @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")
58 List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date); 58 List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
59 59
60 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2") 60 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a99a61f
@@ -468,37 +468,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -468,37 +468,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
468 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName); 468 // int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
469 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName); 469 // int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
470 int jhbc = 0,cjbc = 0,ljbc = 0; 470 int jhbc = 0,cjbc = 0,ljbc = 0;
471 - double jhlc = 0, yygl = 0, ksgl = 0; 471 + double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
472 float addMileage = 0l,remMileage = 0l; 472 float addMileage = 0l,remMileage = 0l;
473 473
474 Map<String,Object> map; 474 Map<String,Object> map;
475 for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){ 475 for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
476 if(scheduleRealInfo != null){ 476 if(scheduleRealInfo != null){
477 //计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次 477 //计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
478 - if(scheduleRealInfo.isSflj()){  
479 - addMileage += addMileage += scheduleRealInfo.getAddMileage()==null?0:scheduleRealInfo.getAddMileage();  
480 - ljbc++;  
481 - }else{  
482 - jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();  
483 - if(scheduleRealInfo.getStatus() != -1){  
484 - remMileage += scheduleRealInfo.getRemMileage()==null?0:scheduleRealInfo.getRemMileage(); 478 + if(scheduleRealInfo != null){
  479 + //计划里程（主任务过滤掉临加班次），
  480 + //烂班里程（主任务烂班），
  481 + //临加里程（主任务临加），
  482 + //计划班次，烂班班次，增加班次
  483 + tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  484 + if(scheduleRealInfo.isSflj()){
  485 + addMileage += tempJhlc;
  486 + ljbc++;
485 }else{ 487 }else{
486 - cjbc++; 488 + jhlc += tempJhlc;
  489 + jhbc++;
  490 + if(scheduleRealInfo.getStatus() == -1){
  491 + remMileage += tempJhlc;
  492 + cjbc++;
  493 + }
487 } 494 }
488 - jhbc++;  
489 - }  
490 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
491 - //计算营运里程，空驶里程  
492 - if(childTaskPlans.isEmpty()){  
493 - yygl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();  
494 - }else{  
495 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
496 - while(it.hasNext()){  
497 - ChildTaskPlan childTaskPlan = it.next();  
498 - if(childTaskPlan.getMileageType().equals("empty")){  
499 - ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 495 + Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
  496 + //计算营运里程，空驶里程
  497 + if(childTaskPlans.isEmpty()){
  498 + if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
  499 + || scheduleRealInfo.getBcType().equals("venting")){
  500 + ksgl += tempJhlc;
500 }else{ 501 }else{
501 - yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 502 + yygl += tempJhlc;
  503 + }
  504 + }else{
  505 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  506 + while(it.hasNext()){
  507 + ChildTaskPlan childTaskPlan = it.next();
  508 + if(childTaskPlan.getMileageType().equals("empty")){
  509 + ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  510 + }else{
  511 + yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  512 + }
502 } 513 }
503 } 514 }
504 } 515 }
@@ -1123,39 +1134,164 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1123,39 +1134,164 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1123 List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date); 1134 List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
1124 List<Map<String,Object>> lMap = new ArrayList<Map<String,Object>>(); 1135 List<Map<String,Object>> lMap = new ArrayList<Map<String,Object>>();
1125 DecimalFormat format = new DecimalFormat("0.00"); 1136 DecimalFormat format = new DecimalFormat("0.00");
1126 - double jhlc = 0.00;  
1127 - float sjgl = 0l,ssgl = 0l; 1137 + double jhlc = 0, tempJhlc = 0,childMileage = 0;
  1138 + float sjgl = 0f,ssgl = 0f,ssgl_lz = 0f,ssgl_dm = 0f,ssgl_gz = 0f,ssgl_jf = 0f,ssgl_zs = 0f,ssgl_qr = 0f
  1139 + ,ssgl_qc = 0f,ssgl_kx = 0f,ssgl_qh = 0f,ssgl_yw = 0f,ssgl_other = 0f,ljgl = 0f;
  1140 + //班次
  1141 + int sj_0 = 6*60+31,sj_1 = 8*60+30,sj_2 = 16*60+1,sj_3 = 18*60;
  1142 + int jhbc = 0,jhbc_m = 0,jhbc_a = 0;
  1143 + int sjbc = 0,sjbc_m = 0,sjbc_a = 0;
  1144 + int ljbc = 0,ljbc_m = 0,ljbc_a = 0;
  1145 + int fzbc = 0,fzbc_m = 0,fzbc_a = 0;
  1146 + int dtbc = 0,dtbc_m = 0,dtbc_a = 0;
  1147 + int djg = 0,djg_m = 0,djg_a = 0,djg_time = 0;
1128 Map<String,Object> map = new HashMap<String, Object>(); 1148 Map<String,Object> map = new HashMap<String, Object>();
1129 for(ScheduleRealInfo scheduleRealInfo: list){ 1149 for(ScheduleRealInfo scheduleRealInfo: list){
1130 if(scheduleRealInfo != null){ 1150 if(scheduleRealInfo != null){
1131 - if(!scheduleRealInfo.isSflj()){  
1132 - jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();  
1133 - }  
1134 - if(scheduleRealInfo.isDestroy()){  
1135 - ssgl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();  
1136 - }  
1137 -  
1138 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); 1151 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
1139 - //计算实际里程，空驶里程 1152 + //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
1140 if(childTaskPlans.isEmpty()){ 1153 if(childTaskPlans.isEmpty()){
1141 - sjgl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc(); 1154 + tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
  1155 + jhlc += tempJhlc;
  1156 + if(scheduleRealInfo.getStatus() == 2){
  1157 + sjgl += tempJhlc;
  1158 + }else if(scheduleRealInfo.getStatus() == -1){
  1159 + ssgl += tempJhlc;
  1160 + if(scheduleRealInfo.getRemarks().indexOf("路阻") != -1){
  1161 + ssgl_lz += tempJhlc;
  1162 + }else if(scheduleRealInfo.getRemarks().indexOf("吊慢") != -1){
  1163 + ssgl_dm += tempJhlc;
  1164 + }else if(scheduleRealInfo.getRemarks().indexOf("故障") != -1){
  1165 + ssgl_gz += tempJhlc;
  1166 + }else if(scheduleRealInfo.getRemarks().indexOf("纠纷") != -1){
  1167 + ssgl_jf += tempJhlc;
  1168 + }else if(scheduleRealInfo.getRemarks().indexOf("肇事") != -1){
  1169 + ssgl_zs += tempJhlc;
  1170 + }else if(scheduleRealInfo.getRemarks().indexOf("缺人") != -1){
  1171 + ssgl_qr += tempJhlc;
  1172 + }else if(scheduleRealInfo.getRemarks().indexOf("缺车") != -1){
  1173 + ssgl_qc += tempJhlc;
  1174 + }else if(scheduleRealInfo.getRemarks().indexOf("客稀") != -1){
  1175 + ssgl_kx += tempJhlc;
  1176 + }else if(scheduleRealInfo.getRemarks().indexOf("气候") != -1){
  1177 + ssgl_qh += tempJhlc;
  1178 + }else if(scheduleRealInfo.getRemarks().indexOf("援外") != -1){
  1179 + ssgl_yw += tempJhlc;
  1180 + }else{
  1181 + ssgl_other += tempJhlc;
  1182 + }
  1183 +
  1184 + //临加公里
  1185 + if(scheduleRealInfo.isSflj()){
  1186 + ljgl += tempJhlc;
  1187 + }
  1188 + }
1142 }else{ 1189 }else{
1143 Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); 1190 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
1144 while(it.hasNext()){ 1191 while(it.hasNext()){
1145 ChildTaskPlan childTaskPlan = it.next(); 1192 ChildTaskPlan childTaskPlan = it.next();
  1193 + childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
  1194 + jhlc += childMileage;
1146 if(childTaskPlan.isDestroy()){ 1195 if(childTaskPlan.isDestroy()){
1147 - ssgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 1196 + ssgl += childMileage;
  1197 + if(childTaskPlan.getDestroyReason().equals("路阻")){
  1198 + ssgl_lz += childTaskPlan.getMileage();
  1199 + }else if(childTaskPlan.getDestroyReason().equals("吊慢")){
  1200 + ssgl_dm += childTaskPlan.getMileage();
  1201 + }else if(childTaskPlan.getDestroyReason().equals("故障")){
  1202 + ssgl_gz += childTaskPlan.getMileage();
  1203 + }else if(childTaskPlan.getDestroyReason().equals("纠纷")){
  1204 + ssgl_jf += childTaskPlan.getMileage();
  1205 + }else if(childTaskPlan.getDestroyReason().equals("肇事")){
  1206 + ssgl_zs += childTaskPlan.getMileage();
  1207 + }else if(childTaskPlan.getDestroyReason().equals("缺人")){
  1208 + ssgl_qr += childTaskPlan.getMileage();
  1209 + }else if(childTaskPlan.getDestroyReason().equals("缺车")){
  1210 + ssgl_qc += childTaskPlan.getMileage();
  1211 + }else if(childTaskPlan.getDestroyReason().equals("客稀")){
  1212 + ssgl_kx += childTaskPlan.getMileage();
  1213 + }else if(childTaskPlan.getDestroyReason().equals("气候")){
  1214 + ssgl_qh += childTaskPlan.getMileage();
  1215 + }else if(childTaskPlan.getDestroyReason().equals("援外")){
  1216 + ssgl_yw += childTaskPlan.getMileage();
  1217 + }else{
  1218 + ssgl_other += childTaskPlan.getMileage();
  1219 + }
1148 }else{ 1220 }else{
1149 - sjgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage(); 1221 + sjgl += childMileage;
1150 } 1222 }
1151 } 1223 }
1152 } 1224 }
  1225 +
  1226 + //班次
  1227 + jhbc++;
  1228 + String[] fcsj = scheduleRealInfo.getFcsj().split(":");
  1229 + String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
  1230 + if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
  1231 + jhbc_m++;
  1232 + }else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
  1233 + jhbc_a++;
  1234 + }
  1235 + if(scheduleRealInfo.getStatus() == 2){
  1236 + sjbc++;
  1237 + if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
  1238 + sjbc_m++;
  1239 + }else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
  1240 + sjbc_a++;
  1241 + }
  1242 + }
  1243 + if(scheduleRealInfo.isSflj()){
  1244 + ljbc++;
  1245 + if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
  1246 + ljbc_m++;
  1247 + }else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
  1248 + ljbc_a++;
  1249 + }
  1250 + }
  1251 + if(scheduleRealInfo.getBcType().equals("venting")){
  1252 + fzbc++;
  1253 + if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
  1254 + fzbc_m++;
  1255 + }else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
  1256 + fzbc_a++;
  1257 + }
  1258 + }
1153 } 1259 }
1154 } 1260 }
1155 map.put("xlName", xlName); 1261 map.put("xlName", xlName);
1156 map.put("jhlc", format.format(jhlc)); 1262 map.put("jhlc", format.format(jhlc));
1157 map.put("sjgl", format.format(sjgl)); 1263 map.put("sjgl", format.format(sjgl));
1158 map.put("ssgl", format.format(ssgl)); 1264 map.put("ssgl", format.format(ssgl));
  1265 + map.put("ssgl_lz", ssgl_lz==0?0:format.format(ssgl_lz));
  1266 + map.put("ssgl_dm", ssgl_dm==0?0:format.format(ssgl_dm));
  1267 + map.put("ssgl_gz", ssgl_gz==0?0:format.format(ssgl_gz));
  1268 + map.put("ssgl_jf", ssgl_jf==0?0:format.format(ssgl_jf));
  1269 + map.put("ssgl_zs", ssgl_zs==0?0:format.format(ssgl_zs));
  1270 + map.put("ssgl_qr", ssgl_qr==0?0:format.format(ssgl_qr));
  1271 + map.put("ssgl_qc", ssgl_qc==0?0:format.format(ssgl_qc));
  1272 + map.put("ssgl_kx", ssgl_kx==0?0:format.format(ssgl_kx));
  1273 + map.put("ssgl_qh", ssgl_qh==0?0:format.format(ssgl_qh));
  1274 + map.put("ssgl_yw", ssgl_yw==0?0:format.format(ssgl_yw));
  1275 + map.put("ssgl_other", ssgl_other==0?0:format.format(ssgl_other));
  1276 + map.put("ljgl", ljgl==0?0:format.format(ljgl));
  1277 + map.put("jhbc_m", jhbc_m);
  1278 + map.put("jhbc_a", jhbc_a);
  1279 + map.put("sjbc", sjbc);
  1280 + map.put("sjbc_m", sjbc_m);
  1281 + map.put("sjbc_a", sjbc_a);
  1282 + map.put("ljbc", ljbc);
  1283 + map.put("ljbc_m", ljbc_m);
  1284 + map.put("ljbc_a", ljbc_a);
  1285 + map.put("fzbc", fzbc);
  1286 + map.put("fzbc_m", fzbc_m);
  1287 + map.put("fzbc_a", fzbc_a);
  1288 + map.put("dtbc", dtbc);
  1289 + map.put("dtbc_m", dtbc_m);
  1290 + map.put("dtbc_a", dtbc_a);
  1291 + map.put("djg", djg);
  1292 + map.put("djg_m", djg_m);
  1293 + map.put("djg_a", djg_a);
  1294 + map.put("djg_time", djg_time);
1159 lMap.add(map); 1295 lMap.add(map);
1160 return lMap; 1296 return lMap;
1161 } 1297 }
@@ -1260,6 +1396,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1260,6 +1396,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1260 1396
1261 @Override 1397 @Override
1262 public List<ScheduleRealInfo> realScheduleList(String line, String date) { 1398 public List<ScheduleRealInfo> realScheduleList(String line, String date) {
  1399 + List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
  1400 + List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
  1401 + for(ScheduleRealInfo info:listInfo){
  1402 + for(ScheduleRealInfo total:listTotal){
  1403 + if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
  1404 +
  1405 + }
  1406 + }
  1407 + }
1263 return scheduleRealInfoRepository.scheduleByDateAndLine(line, date); 1408 return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
1264 } 1409 }
1265 1410
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @a99a61f
@@ -101,6 +101,10 @@ @@ -101,6 +101,10 @@
101 <td>16:01~<br>18:00</td> 101 <td>16:01~<br>18:00</td>
102 </tr> 102 </tr>
103 </thead> 103 </thead>
  104 +
  105 + <tbody class="scheduleDaily_1">
  106 +
  107 + </tbody>
104 <tr> 108 <tr>
105 <td colspan="40">&nbsp;</td> 109 <td colspan="40">&nbsp;</td>
106 </tr> 110 </tr>
@@ -297,7 +301,12 @@ @@ -297,7 +301,12 @@
297 //查询 301 //查询
298 $("#query").on('click',function(){ 302 $("#query").on('click',function(){
299 var line = $("#line").val(); 303 var line = $("#line").val();
  304 + var xlName = $("#line").text();
300 var date = $("#date").val(); 305 var date = $("#date").val();
  306 + $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName},function(result){
  307 + var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
  308 + $('#forms .scheduleDaily_1').html(scheduleDaily_1);
  309 + });
301 $.get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){ 310 $.get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
302 var scheduleDaily_2 = template('scheduleDaily_2',{list:result}); 311 var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
303 $('#forms .scheduleDaily_2').html(scheduleDaily_2); 312 $('#forms .scheduleDaily_2').html(scheduleDaily_2);
@@ -310,6 +319,53 @@ @@ -310,6 +319,53 @@
310 }); 319 });
311 }); 320 });
312 </script> 321 </script>
  322 +<script type="text/html" id="scheduleDaily_1">
  323 + {{each list as obj i}}
  324 + <tr>
  325 + <td>{{obj.xlName}}</td>
  326 + <td>{{obj.jhlc}}</td>
  327 + <td>{{obj.sjgl}}</td>
  328 + <td>{{obj.ssgl}}</td>
  329 + <td>{{obj.ssgl_lz}}</td>
  330 + <td>{{obj.ssgl_dm}}</td>
  331 + <td>{{obj.ssgl_gz}}</td>
  332 + <td>{{obj.ssgl_jf}}</td>
  333 + <td>{{obj.ssgl_zs}}</td>
  334 + <td>{{obj.ssgl_qr}}</td>
  335 + <td>{{obj.ssgl_qc}}</td>
  336 + <td>{{obj.ssgl_kx}}</td>
  337 + <td>{{obj.ssgl_qh}}</td>
  338 + <td>{{obj.ssgl_yw}}</td>
  339 + <td>{{obj.ssgl_other}}</td>
  340 + <td>{{obj.ljgl}}</td>
  341 + <td>{{obj.jhbc}}</td>
  342 + <td>{{obj.jhbc_m}}</td>
  343 + <td>{{obj.jhbc_a}}</td>
  344 + <td>{{obj.sjbc}}</td>
  345 + <td>{{obj.sjbc_m}}</td>
  346 + <td>{{obj.sjbc_a}}</td>
  347 + <td>{{obj.ljbc}}</td>
  348 + <td>{{obj.ljbc_m}}</td>
  349 + <td>{{obj.ljbc_a}}</td>
  350 + <td>{{obj.fzbc}}</td>
  351 + <td>{{obj.fzbc_m}}</td>
  352 + <td>{{obj.fzbc_a}}</td>
  353 + <td>{{obj.dtbc}}</td>
  354 + <td>{{obj.dtbc_m}}</td>
  355 + <td>{{obj.dtbc_a}}</td>
  356 + <td>{{obj.djg}}</td>
  357 + <td>{{obj.djg_m}}</td>
  358 + <td>{{obj.djg_a}}</td>
  359 + <td>{{obj.djg_time}}</td>
  360 + <td colspan="5">&nbsp;</td>
  361 + </tr>
  362 + {{/each}}
  363 + {{if list.length == 0}}
  364 + <tr>
  365 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  366 + </tr>
  367 + {{/if}}
  368 +</script>
313 <script type="text/html" id="scheduleDaily_2"> 369 <script type="text/html" id="scheduleDaily_2">
314 {{each list as obj i}} 370 {{each list as obj i}}
315 {{if i%5 == 0}} 371 {{if i%5 == 0}}
src/main/resources/static/pages/forms/statement/scheduleDaily_minhang.html
  View file @a99a61f
@@ -101,6 +101,10 @@ @@ -101,6 +101,10 @@
101 <td>16:01~<br>18:00</td> 101 <td>16:01~<br>18:00</td>
102 </tr> 102 </tr>
103 </thead> 103 </thead>
  104 +
  105 + <tbody class="scheduleDaily_1">
  106 +
  107 + </tbody>
104 <tr> 108 <tr>
105 <td colspan="40">&nbsp;</td> 109 <td colspan="40">&nbsp;</td>
106 </tr> 110 </tr>
@@ -255,7 +259,12 @@ @@ -255,7 +259,12 @@
255 //查询 259 //查询
256 $("#query").on('click',function(){ 260 $("#query").on('click',function(){
257 var line = $("#line").val(); 261 var line = $("#line").val();
  262 + var xlName = $("#line").text();
258 var date = $("#date").val(); 263 var date = $("#date").val();
  264 + $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName},function(result){
  265 + var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
  266 + $('#forms .scheduleDaily_1').html(scheduleDaily_1);
  267 + });
259 $.get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){ 268 $.get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
260 var scheduleDaily_2 = template('scheduleDaily_2',{list:result}); 269 var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
261 $('#forms .scheduleDaily_2').html(scheduleDaily_2); 270 $('#forms .scheduleDaily_2').html(scheduleDaily_2);
@@ -268,6 +277,53 @@ @@ -268,6 +277,53 @@
268 }); 277 });
269 }); 278 });
270 </script> 279 </script>
  280 +<script type="text/html" id="scheduleDaily_1">
  281 + {{each list as obj i}}
  282 + <tr>
  283 + <td>{{obj.xlName}}</td>
  284 + <td>{{obj.jhlc}}</td>
  285 + <td>{{obj.sjgl}}</td>
  286 + <td>{{obj.ssgl}}</td>
  287 + <td>{{obj.ssgl_lz}}</td>
  288 + <td>{{obj.ssgl_dm}}</td>
  289 + <td>{{obj.ssgl_gz}}</td>
  290 + <td>{{obj.ssgl_jf}}</td>
  291 + <td>{{obj.ssgl_zs}}</td>
  292 + <td>{{obj.ssgl_qr}}</td>
  293 + <td>{{obj.ssgl_qc}}</td>
  294 + <td>{{obj.ssgl_kx}}</td>
  295 + <td>{{obj.ssgl_qh}}</td>
  296 + <td>{{obj.ssgl_yw}}</td>
  297 + <td>{{obj.ssgl_other}}</td>
  298 + <td>{{obj.ljgl}}</td>
  299 + <td>{{obj.jhbc}}</td>
  300 + <td>{{obj.jhbc_m}}</td>
  301 + <td>{{obj.jhbc_a}}</td>
  302 + <td>{{obj.sjbc}}</td>
  303 + <td>{{obj.sjbc_m}}</td>
  304 + <td>{{obj.sjbc_a}}</td>
  305 + <td>{{obj.ljbc}}</td>
  306 + <td>{{obj.ljbc_m}}</td>
  307 + <td>{{obj.ljbc_a}}</td>
  308 + <td>{{obj.fzbc}}</td>
  309 + <td>{{obj.fzbc_m}}</td>
  310 + <td>{{obj.fzbc_a}}</td>
  311 + <td>{{obj.dtbc}}</td>
  312 + <td>{{obj.dtbc_m}}</td>
  313 + <td>{{obj.dtbc_a}}</td>
  314 + <td>{{obj.djg}}</td>
  315 + <td>{{obj.djg_m}}</td>
  316 + <td>{{obj.djg_a}}</td>
  317 + <td>{{obj.djg_time}}</td>
  318 + <td colspan="5">&nbsp;</td>
  319 + </tr>
  320 + {{/each}}
  321 + {{if list.length == 0}}
  322 + <tr>
  323 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  324 + </tr>
  325 + {{/if}}
  326 +</script>
271 <script type="text/html" id="scheduleDaily_2"> 327 <script type="text/html" id="scheduleDaily_2">
272 {{each list as obj i}} 328 {{each list as obj i}}
273 {{if i%5 == 0}} 329 {{if i%5 == 0}}
src/main/resources/static/pages/forms/statement/statisticsDaily .html
  View file @a99a61f
@@ -221,43 +221,43 @@ @@ -221,43 +221,43 @@
221 <td>{{obj.jhlc}}</td> 221 <td>{{obj.jhlc}}</td>
222 <td>{{obj.sjgl}}</td> 222 <td>{{obj.sjgl}}</td>
223 <td>{{obj.ssgl}}</td> 223 <td>{{obj.ssgl}}</td>
224 - <td>&nbsp;</td>  
225 - <td>&nbsp;</td>  
226 - <td>&nbsp;</td>  
227 - <td>&nbsp;</td>  
228 - <td>&nbsp;</td>  
229 - <td>&nbsp;</td>  
230 - <td>&nbsp;</td>  
231 - <td>&nbsp;</td>  
232 - <td>&nbsp;</td>  
233 - <td>&nbsp;</td>  
234 - <td>&nbsp;</td>  
235 - <td>&nbsp;</td>  
236 - <td>&nbsp;</td>  
237 - <td>&nbsp;</td>  
238 - <td>&nbsp;</td>  
239 - <td>&nbsp;</td>  
240 - <td>&nbsp;</td>  
241 - <td>&nbsp;</td>  
242 - <td>&nbsp;</td>  
243 - <td>&nbsp;</td>  
244 - <td>&nbsp;</td>  
245 - <td>&nbsp;</td>  
246 - <td>&nbsp;</td>  
247 - <td>&nbsp;</td>  
248 - <td>&nbsp;</td>  
249 - <td>&nbsp;</td>  
250 - <td>&nbsp;</td>  
251 - <td>&nbsp;</td>  
252 - <td>&nbsp;</td>  
253 - <td>&nbsp;</td>  
254 - <td>&nbsp;</td> 224 + <td>{{obj.ssgl_lz}}</td>
  225 + <td>{{obj.ssgl_dm}}</td>
  226 + <td>{{obj.ssgl_gz}}</td>
  227 + <td>{{obj.ssgl_jf}}</td>
  228 + <td>{{obj.ssgl_zs}}</td>
  229 + <td>{{obj.ssgl_qr}}</td>
  230 + <td>{{obj.ssgl_qc}}</td>
  231 + <td>{{obj.ssgl_kx}}</td>
  232 + <td>{{obj.ssgl_qh}}</td>
  233 + <td>{{obj.ssgl_yw}}</td>
  234 + <td>{{obj.ssgl_other}}</td>
  235 + <td>{{obj.ljgl}}</td>
  236 + <td>{{obj.jhbc}}</td>
  237 + <td>{{obj.jhbc_m}}</td>
  238 + <td>{{obj.jhbc_a}}</td>
  239 + <td>{{obj.sjbc}}</td>
  240 + <td>{{obj.sjbc_m}}</td>
  241 + <td>{{obj.sjbc_a}}</td>
  242 + <td>{{obj.ljbc}}</td>
  243 + <td>{{obj.ljbc_m}}</td>
  244 + <td>{{obj.ljbc_a}}</td>
  245 + <td>{{obj.fzbc}}</td>
  246 + <td>{{obj.fzbc_m}}</td>
  247 + <td>{{obj.fzbc_a}}</td>
  248 + <td>{{obj.dtbc}}</td>
  249 + <td>{{obj.dtbc_m}}</td>
  250 + <td>{{obj.dtbc_a}}</td>
  251 + <td>{{obj.djg}}</td>
  252 + <td>{{obj.djg_m}}</td>
  253 + <td>{{obj.djg_a}}</td>
  254 + <td>{{obj.djg_time}}</td>
255 <td>&nbsp;</td> 255 <td>&nbsp;</td>
256 </tr> 256 </tr>
257 {{/each}} 257 {{/each}}
258 {{if list.length == 0}} 258 {{if list.length == 0}}
259 <tr> 259 <tr>
260 - <td colspan="6"><h6 class="muted">没有找到相关数据</h6></td> 260 + <td colspan="36"><h6 class="muted">没有找到相关数据</h6></td>
261 </tr> 261 </tr>
262 {{/if}} 262 {{/if}}
263 </script> 263 </script>
264 \ No newline at end of file 264 \ No newline at end of file
src/main/resources/static/pages/forms/statement/waybill.html
  View file @a99a61f
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 } 135 }
136 }); 136 });
137 137
138 - var date; 138 + var date = '';
139 $("#query").on("click",function(){ 139 $("#query").on("click",function(){
140 var line = $("#line").val(); 140 var line = $("#line").val();
141 date = $("#date").val(); 141 date = $("#date").val();
@@ -148,8 +148,8 @@ @@ -148,8 +148,8 @@
148 }); 148 });
149 }); 149 });
150 150
151 - var params = {};  
152 - var jName; 151 + var params = new Array();
  152 + var jName = '';
153 $("#info tbody").on("click","tr",function(){ 153 $("#info tbody").on("click","tr",function(){
154 if($(this).children().size() < 2){ 154 if($(this).children().size() < 2){
155 return; 155 return;
@@ -182,6 +182,9 @@ @@ -182,6 +182,9 @@
182 }); 182 });
183 183
184 $("#export").on("click",function(){ 184 $("#export").on("click",function(){
  185 + if(params.length < 1){
  186 + return;
  187 + }
185 $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){ 188 $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
186 window.open("/downloadFile/download?fileName="+jName); 189 window.open("/downloadFile/download?fileName="+jName);
187 }); 190 });
@@ -191,6 +194,13 @@ @@ -191,6 +194,13 @@
191 $("#printArea").printArea(); 194 $("#printArea").printArea();
192 }); 195 });
193 196
  197 + $("#exportMore").on("click",function(){
  198 + return;
  199 + $post('/realSchedule/exportWaybillMore',{date:date},function(result){
  200 + window.open("/downloadFile/download?fileName="+jName);
  201 + });
  202 + });
  203 +
194 function getTime(list){ 204 function getTime(list){
195 $.each(list, function(i, obj) { 205 $.each(list, function(i, obj) {
196 if(obj.zdsj != null && obj.zdsjActual != null ){ 206 if(obj.zdsj != null && obj.zdsjActual != null ){
@@ -310,32 +320,32 @@ @@ -310,32 +320,32 @@
310 <tr> 320 <tr>
311 <td colspan="2">计划公里</td> 321 <td colspan="2">计划公里</td>
312 <td>{{jhlc}}</td> 322 <td>{{jhlc}}</td>
313 - <td colspan="2">抽减公里</td> 323 + <td colspan="2">烂班公里</td>
314 <td>{{remMileage}}</td> 324 <td>{{remMileage}}</td>
315 - <td colspan="2">增加公里</td> 325 + <td colspan="2">临加公里</td>
316 <td>{{addMileage}}</td> 326 <td>{{addMileage}}</td>
317 - <td colspan="2">实际计划公里</td>  
318 - <td colspan="3">{{jhlc}}</td> 327 + <td colspan="2">营运公里</td>
  328 + <td colspan="3">{{yygl}}</td>
319 </tr> 329 </tr>
320 <tr> 330 <tr>
321 - <td colspan="2">营运公里</td>  
322 - <td>{{realMileage}}</td>  
323 <td colspan="2">空驶公里</td> 331 <td colspan="2">空驶公里</td>
324 <td>{{ksgl}}</td> 332 <td>{{ksgl}}</td>
325 <td colspan="2">总公里</td> 333 <td colspan="2">总公里</td>
326 <td>{{realMileage}}</td> 334 <td>{{realMileage}}</td>
327 <td colspan="2">计划班次</td> 335 <td colspan="2">计划班次</td>
328 - <td colspan="3">{{jhbc}}</td> 336 + <td>{{jhbc}}</td>
  337 + <td colspan="2">烂班班次</td>
  338 + <td colspan="3">{{cjbc}}</td>
329 </tr> 339 </tr>
330 <tr> 340 <tr>
331 - <td colspan="2">抽减班次</td>  
332 - <td>{{cjbc}}</td>  
333 <td colspan="2">增加班次</td> 341 <td colspan="2">增加班次</td>
334 <td>{{ljbc}}</td> 342 <td>{{ljbc}}</td>
335 - <td colspan="2">实际计划班次</td>  
336 - <td>{{jhbc}}</td>  
337 <td colspan="2">实际班次</td> 343 <td colspan="2">实际班次</td>
338 - <td colspan="3">{{sjbc}}</td> 344 + <td>{{sjbc}}</td>
  345 + <td colspan="2"></td>
  346 + <td></td>
  347 + <td colspan="2"></td>
  348 + <td colspan="3"></td>
339 </tr> 349 </tr>
340 </script> 350 </script>
341 <script type="text/html" id="ludan_4"> 351 <script type="text/html" id="ludan_4">
src/main/resources/static/pages/forms/statement/waybill_minhang.html
  View file @a99a61f
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 } 135 }
136 }); 136 });
137 137
138 - var date; 138 + var date = '';
139 $("#query").on("click",function(){ 139 $("#query").on("click",function(){
140 var line = $("#line").val(); 140 var line = $("#line").val();
141 date = $("#date").val(); 141 date = $("#date").val();
@@ -148,8 +148,8 @@ @@ -148,8 +148,8 @@
148 }); 148 });
149 }); 149 });
150 150
151 - var params = {};  
152 - var jName; 151 + var params = new Array();
  152 + var jName = '';
153 $("#info tbody").on("click","tr",function(){ 153 $("#info tbody").on("click","tr",function(){
154 if($(this).children().size() < 2){ 154 if($(this).children().size() < 2){
155 return; 155 return;
@@ -182,6 +182,9 @@ @@ -182,6 +182,9 @@
182 }); 182 });
183 183
184 $("#export").on("click",function(){ 184 $("#export").on("click",function(){
  185 + if(params.length < 1){
  186 + return;
  187 + }
185 $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){ 188 $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
186 window.open("/downloadFile/download?fileName="+jName); 189 window.open("/downloadFile/download?fileName="+jName);
187 }); 190 });
@@ -191,6 +194,13 @@ @@ -191,6 +194,13 @@
191 $("#printArea").printArea(); 194 $("#printArea").printArea();
192 }); 195 });
193 196
  197 + $("#exportMore").on("click",function(){
  198 + return;
  199 + $post('/realSchedule/exportWaybillMore',{date:date},function(result){
  200 + window.open("/downloadFile/download?fileName="+jName);
  201 + });
  202 + });
  203 +
194 function getTime(list){ 204 function getTime(list){
195 $.each(list, function(i, obj) { 205 $.each(list, function(i, obj) {
196 if(obj.zdsj != null && obj.zdsjActual != null ){ 206 if(obj.zdsj != null && obj.zdsjActual != null ){