潘钊 / control_service_data_Interface · Commits

Commit 76984f79f413f393b4fd4459a38f841ad3ab735a

Authored by 娄高锋
1 parent aa1c00fd
build: skipped

闵行接口，以线调为准修改接口给出的烂班类型；

Inline Side-by-side
Showing 1 changed file with 24 additions and 24 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @76984f7
@@ -506,21 +506,17 @@ public class BigscreenService { @@ -506,21 +506,17 @@ public class BigscreenService {
506 double zksgl = Arith.add(sjjccgl, sjksgl); 506 double zksgl = Arith.add(sjjccgl, sjksgl);
507 double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里 507 double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
508 double lz = culateCJLC(listSche, "路阻"); 508 double lz = culateCJLC(listSche, "路阻");
509 - double dm = culateCJLC(listSche, "吊慢"); 509 + double dm = culateCJLC(listSche, "借调");
510 double gz = culateCJLC(listSche, "故障"); 510 double gz = culateCJLC(listSche, "故障");
511 double jf = culateCJLC(listSche, "纠纷"); 511 double jf = culateCJLC(listSche, "纠纷");
512 - double zs = culateCJLC(listSche, "肇事"); 512 + double zs = culateCJLC(listSche, "事故");
513 double qr = culateCJLC(listSche, "缺人"); 513 double qr = culateCJLC(listSche, "缺人");
514 - double qc = culateCJLC(listSche, "缺车"); 514 + double qc = culateCJLC(listSche, "验车");
515 double qrqc = Arith.add(qr, qc);//缺人缺车 515 double qrqc = Arith.add(qr, qc);//缺人缺车
516 - double kx = culateCJLC(listSche, "客稀");  
517 - double qh = culateCJLC(listSche, "气候");  
518 - double yw = culateCJLC(listSche, "援外");  
519 - double lb_pc = culateCJLC(listSche, "配车");  
520 - double lb_by = culateCJLC(listSche, "保养");  
521 - double lb_cj = culateCJLC(listSche, "抽减");  
522 - double lb_qt = culateCJLC(listSche, "其他");  
523 - double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他 516 + double by = culateCJLC(listSche, "保养");
  517 + double qh = culateCJLC(listSche, "天气");
  518 + double yw = culateCJLC(listSche, "支援");
  519 + double qt = culateCJLC(listSche, "其他");
524 520
525 Map<String, Object> jhzglMap = new HashMap<String, Object>(); 521 Map<String, Object> jhzglMap = new HashMap<String, Object>();
526 jhzglMap.put("name", "计划总公里"); 522 jhzglMap.put("name", "计划总公里");
@@ -535,7 +531,7 @@ public class BigscreenService { @@ -535,7 +531,7 @@ public class BigscreenService {
535 lzMap.put("value", lz); 531 lzMap.put("value", lz);
536 glList.add(lzMap); 532 glList.add(lzMap);
537 Map<String, Object> dmMap = new HashMap<String, Object>(); 533 Map<String, Object> dmMap = new HashMap<String, Object>();
538 - dmMap.put("name", "吊慢"); 534 + dmMap.put("name", "借调");
539 dmMap.put("value", dm); 535 dmMap.put("value", dm);
540 glList.add(dmMap); 536 glList.add(dmMap);
541 Map<String, Object> gzMap = new HashMap<String, Object>(); 537 Map<String, Object> gzMap = new HashMap<String, Object>();
@@ -547,23 +543,27 @@ public class BigscreenService { @@ -547,23 +543,27 @@ public class BigscreenService {
547 jfMap.put("value", jf); 543 jfMap.put("value", jf);
548 glList.add(jfMap); 544 glList.add(jfMap);
549 Map<String, Object> zsMap = new HashMap<String, Object>(); 545 Map<String, Object> zsMap = new HashMap<String, Object>();
550 - zsMap.put("name", "肇事"); 546 + zsMap.put("name", "事故");
551 zsMap.put("value", zs); 547 zsMap.put("value", zs);
552 glList.add(zsMap); 548 glList.add(zsMap);
553 - Map<String, Object> qrqcMap = new HashMap<String, Object>();  
554 - qrqcMap.put("name", "缺人缺车");  
555 - qrqcMap.put("value", qrqc);  
556 - glList.add(qrqcMap);  
557 - Map<String, Object> kxMap = new HashMap<String, Object>();  
558 - kxMap.put("name", "客稀");  
559 - kxMap.put("value", kx);  
560 - glList.add(kxMap); 549 + Map<String, Object> qrMap = new HashMap<String, Object>();
  550 + qrMap.put("name", "缺人");
  551 + qrMap.put("value", qr);
  552 + glList.add(qrMap);
  553 + Map<String, Object> qcMap = new HashMap<String, Object>();
  554 + qcMap.put("name", "缺人");
  555 + qcMap.put("value", qc);
  556 + glList.add(qcMap);
  557 + Map<String, Object> byMap = new HashMap<String, Object>();
  558 + byMap.put("name", "保养");
  559 + byMap.put("value", by);
  560 + glList.add(byMap);
561 Map<String, Object> qhMap = new HashMap<String, Object>(); 561 Map<String, Object> qhMap = new HashMap<String, Object>();
562 - qhMap.put("name", "气候"); 562 + qhMap.put("name", "天气");
563 qhMap.put("value", qh); 563 qhMap.put("value", qh);
564 glList.add(qhMap); 564 glList.add(qhMap);
565 Map<String, Object> ywMap = new HashMap<String, Object>(); 565 Map<String, Object> ywMap = new HashMap<String, Object>();
566 - ywMap.put("name", "援外"); 566 + ywMap.put("name", "支援");
567 ywMap.put("value", yw); 567 ywMap.put("value", yw);
568 glList.add(ywMap); 568 glList.add(ywMap);
569 Map<String, Object> qtMap = new HashMap<String, Object>(); 569 Map<String, Object> qtMap = new HashMap<String, Object>();
@@ -993,7 +993,7 @@ public class BigscreenService { @@ -993,7 +993,7 @@ public class BigscreenService {
993 glList.add(qrMap); 993 glList.add(qrMap);
994 Map<String, Object> qcMap = new HashMap<String, Object>(); 994 Map<String, Object> qcMap = new HashMap<String, Object>();
995 qcMap.put("name", "验车"); 995 qcMap.put("name", "验车");
996 - qcMap.put("value", qr); 996 + qcMap.put("value", qc);
997 glList.add(qcMap); 997 glList.add(qcMap);
998 Map<String, Object> byMap = new HashMap<String, Object>(); 998 Map<String, Object> byMap = new HashMap<String, Object>();
999 byMap.put("name", "保养"); 999 byMap.put("name", "保养");