潘钊 / bsth_control · Commits

Commit 770b34dde9faadff275523cd6b4570741834df8c

Authored by 娄高锋
1 parent 54bdf7ba
build: skipped

update

Inline Side-by-side
Showing 5 changed files with 36 additions and 19 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @770b34d
... ... @@ -1099,7 +1099,7 @@ public class FormsServiceImpl implements FormsService {
1099 1099 if (cts != null && cts.size() > 0) {
1100 1100 newList.add(s);
1101 1101 } else {
1102   - if (s.getZdsjActual() != null) {
  1102 + if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
1103 1103 newList.add(s);
1104 1104 }
1105 1105 }
... ... @@ -1184,7 +1184,7 @@ public class FormsServiceImpl implements FormsService {
1184 1184 if (cts != null && cts.size() > 0) {
1185 1185 newList_.add(s);
1186 1186 } else {
1187   - if (s.getZdsjActual() != null) {
  1187 + if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
1188 1188 newList_.add(s);
1189 1189 }
1190 1190 }
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @770b34d
... ... @@ -418,7 +418,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
418 418 for(ScheduleRealInfo schedule : keyMap2.get(date)){
419 419 if(schedule.getFcsjT() != null && !schedule.isSflj())
420 420 fcsjs.add(schedule.getFcsjT());
421   - if(schedule.getFcsjActualTime() != null && schedule.getStatus() != -1)
  421 + if(schedule.getFcsjActualTime() != null && schedule.getZdsjActualTime() != null
  422 + && schedule.getStatus() != -1)
422 423 fcsjAs.add(schedule.getFcsjActualTime());
423 424 }
424 425 Collections.sort(fcsjs);
... ... @@ -1686,7 +1687,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1686 1687 jhbc++;
1687 1688 jhlc = jhlc.add(lc);
1688 1689 }
1689   - if(schedule.getStatus() != -1 && !schedule.isCcService()){
  1690 + if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
  1691 + && schedule.getStatus() != -1 && !schedule.isCcService()){
1690 1692 sjbc++;
1691 1693 sjlc = sjlc.add(lc);
1692 1694 } else if(schedule.getStatus() == -1 && !schedule.isCcService()){
... ... @@ -1920,8 +1922,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1920 1922 dxtz = 0, lbtz = 0;
1921 1923 for(ScheduleRealInfo schedule : keyMap.get(key)){
1922 1924 boolean flag = false;
1923   - if(schedule.getFcsjActual() != null && schedule.getStatus() != -1
1924   - && !schedule.isCcService()){
  1925 + if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
  1926 + && schedule.getStatus() != -1 && !schedule.isCcService()){
1925 1927 sjbc++;
1926 1928 if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
1927 1929 flag = true;
... ...
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @770b34d
... ... @@ -80,6 +80,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
80 80 schedule.setsGh(rs.getString("s_gh"));
81 81 schedule.setsName(rs.getString("s_name"));
82 82 schedule.setSpId(rs.getLong("sp_id"));
  83 + schedule.setSflj(rs.getBoolean("sflj"));
83 84 schedule.setCcService(rs.getBoolean("cc_service"));
84 85  
85 86 if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
... ... @@ -224,8 +225,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
224 225  
225 226 //分组计算路程公里
226 227 for(SchedulePlanInfo schedule : list){
  228 + if(schedule.getsName() != null && schedule.getsName().trim().equals("")){
  229 + schedule.setsName(null);
  230 + }
227 231 String key = schedule.getXlName() + "/" + schedule.getLpName() + "/" +
228 232 schedule.getClZbh() + "/" + schedule.getjName() + "/" + schedule.getsName();
  233 + key = key.trim();
229 234 if(!keyMap.containsKey(key))
230 235 keyMap.put(key, new ArrayList<SchedulePlanInfo>());
231 236 keyMap.get(key).add(schedule);
... ... @@ -273,10 +278,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
273 278 str += (int)lp.charAt(i);
274 279 }
275 280 Long i = Long.valueOf(str);
276   - if(!tempList.containsKey(i))
  281 + if(!tempList.containsKey(i)){
277 282 tempList.put(i, new ArrayList<Map<String, Object>>());
  283 + keyList.add(i);
  284 + }
278 285 tempList.get(i).add(m);
279   - keyList.add(i);
280 286 }
281 287 Collections.sort(keyList);
282 288 for(Long i : keyList){
... ... @@ -387,14 +393,22 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
387 393 }
388 394  
389 395 //班次数和出场数
390   - jhbc++;
391   - if(schedule.getBcType().equals("out"))
392   - jhcc++;
  396 + if(!schedule.isSflj() && schedule.getFcsj() != null && schedule.getZdsj() != null){
  397 + if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){
  398 + jhbc++;
  399 + System.out.print((""+schedule.isSflj()).equals("false")?"":"X" + " ");
  400 + }
  401 + if(schedule.getBcType().equals("out"))
  402 + jhcc++;
  403 + }
  404 + if(schedule.getStatus() != -1 && schedule.getBcType().equals("out"))
  405 + sjcc++;
393 406  
  407 + if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")
  408 + && schedule.getFcsjActual() != null && schedule.getZdsjActual() != null && schedule.getStatus() != -1){
  409 +
394 410 //发出时间快慢
395 411 if(schedule.getFcsjActual() != null){
396   - if(schedule.getBcType().equals("out"))
397   - sjcc++;
398 412 // schedule.setFcsjActualAll(schedule.getFcsjActual());
399 413 if(schedule.getFcsjActualTime() - schedule.getFcsjT() < -1){
400 414 if(schedule.getXlDir().equals("0"))
... ... @@ -434,14 +448,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
434 448 }
435 449 }
436 450  
437   - if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
438   - && !schedule.getBcType().equals("ldks") && schedule.getFcsjActual() != null){
  451 + if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")
  452 + && schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
439 453 // String clZbh = schedule.getClZbh();
440 454 String xlDir = schedule.getXlDir();
441 455 if(!listMap.containsKey(xlDir))
442 456 listMap.put(xlDir, new ArrayList<ScheduleRealInfo>());
443 457 listMap.get(xlDir).add(schedule);
444 458 }
  459 + }
445 460 }
446 461  
447 462 //求首末班准点率
... ...
src/main/resources/static/pages/forms/statement/busInterval.html
  View file @770b34d
... ... @@ -308,7 +308,7 @@
308 308 // $(".hidden").removeClass("hidden");
309 309 $get('/busInterval/interval', params, function(result){
310 310 // 把数据填充到模版中
311   - var tbodyHtml = template('list_workDaily',{list:result,statu:statu});
  311 + var tbodyHtml = template('list_busInteval',{list:result,statu:statu});
312 312 // 把渲染好的模版html文本追加到表格中
313 313 $('#forms').html(tbodyHtml);
314 314 _w_table_rowspan("#forms tbody", 1);
... ... @@ -440,7 +440,7 @@
440 440 });
441 441  
442 442 </script>
443   -<script type="text/html" id="list_workDaily">
  443 +<script type="text/html" id="list_busInteval">
444 444 <thead>
445 445 <tr>
446 446 <th>日期</th>
... ...
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
  View file @770b34d
... ... @@ -257,7 +257,7 @@
257 257 $(".hidden").removeClass("hidden");
258 258 $get('/pcpc/scheduleAnaly_sum', params, function(result){
259 259 // 把数据填充到模版中
260   - var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
  260 + var tbodyHtml = template('list_scheduleAnaly_sum',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
261 261 // 把渲染好的模版html文本追加到表格中
262 262 $('#forms tbody').html(tbodyHtml);
263 263  
... ... @@ -384,7 +384,7 @@
384 384 });
385 385  
386 386 </script>
387   -<script type="text/html" id="list_scheduleAnaly">
  387 +<script type="text/html" id="list_scheduleAnaly_sum">
388 388 {{each list as obj i}}
389 389 <tr>
390 390 <th style="display: none;"></th>
... ...