潘钊 / control_service_data_Interface · Commits

Commit 41aa7378ec65a6adb6e074bbe163d0e8596d1d42

Authored by 娄高锋
1 parent ba760524

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

Inline Side-by-side
Showing 1 changed file with 23 additions and 23 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @41aa737
@@ -947,21 +947,17 @@ public class BigscreenService { @@ -947,21 +947,17 @@ public class BigscreenService {
947 double zksgl = Arith.add(sjjccgl, sjksgl); 947 double zksgl = Arith.add(sjjccgl, sjksgl);
948 double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里 948 double sjzgl = Arith.add(sjyygl, zksgl);//实际总公里
949 double lz = culateCJLC(listSche, "路阻"); 949 double lz = culateCJLC(listSche, "路阻");
950 - double dm = culateCJLC(listSche, "吊慢"); 950 + double dm = culateCJLC(listSche, "借调");
951 double gz = culateCJLC(listSche, "故障"); 951 double gz = culateCJLC(listSche, "故障");
952 double jf = culateCJLC(listSche, "纠纷"); 952 double jf = culateCJLC(listSche, "纠纷");
953 - double zs = culateCJLC(listSche, "肇事"); 953 + double zs = culateCJLC(listSche, "事故");
954 double qr = culateCJLC(listSche, "缺人"); 954 double qr = culateCJLC(listSche, "缺人");
955 - double qc = culateCJLC(listSche, "缺车"); 955 + double qc = culateCJLC(listSche, "验车");
956 double qrqc = Arith.add(qr, qc);//缺人缺车 956 double qrqc = Arith.add(qr, qc);//缺人缺车
957 - double kx = culateCJLC(listSche, "客稀");  
958 - double qh = culateCJLC(listSche, "气候");  
959 - double yw = culateCJLC(listSche, "援外");  
960 - double lb_pc = culateCJLC(listSche, "配车");  
961 - double lb_by = culateCJLC(listSche, "保养");  
962 - double lb_cj = culateCJLC(listSche, "抽减");  
963 - double lb_qt = culateCJLC(listSche, "其他");  
964 - double qt = Arith.add(Arith.add(lb_pc, lb_by), Arith.add(lb_cj, lb_qt));//其他 957 + double by = culateCJLC(listSche, "保养");
  958 + double qh = culateCJLC(listSche, "天气");
  959 + double yw = culateCJLC(listSche, "支援");
  960 + double qt = culateCJLC(listSche, "其他");
965 961
966 Map<String, Object> jhzglMap = new HashMap<String, Object>(); 962 Map<String, Object> jhzglMap = new HashMap<String, Object>();
967 jhzglMap.put("name", "计划总公里"); 963 jhzglMap.put("name", "计划总公里");
@@ -976,7 +972,7 @@ public class BigscreenService { @@ -976,7 +972,7 @@ public class BigscreenService {
976 lzMap.put("value", lz); 972 lzMap.put("value", lz);
977 glList.add(lzMap); 973 glList.add(lzMap);
978 Map<String, Object> dmMap = new HashMap<String, Object>(); 974 Map<String, Object> dmMap = new HashMap<String, Object>();
979 - dmMap.put("name", "吊慢"); 975 + dmMap.put("name", "借调");
980 dmMap.put("value", dm); 976 dmMap.put("value", dm);
981 glList.add(dmMap); 977 glList.add(dmMap);
982 Map<String, Object> gzMap = new HashMap<String, Object>(); 978 Map<String, Object> gzMap = new HashMap<String, Object>();
@@ -988,23 +984,27 @@ public class BigscreenService { @@ -988,23 +984,27 @@ public class BigscreenService {
988 jfMap.put("value", jf); 984 jfMap.put("value", jf);
989 glList.add(jfMap); 985 glList.add(jfMap);
990 Map<String, Object> zsMap = new HashMap<String, Object>(); 986 Map<String, Object> zsMap = new HashMap<String, Object>();
991 - zsMap.put("name", "肇事"); 987 + zsMap.put("name", "事故");
992 zsMap.put("value", zs); 988 zsMap.put("value", zs);
993 glList.add(zsMap); 989 glList.add(zsMap);
994 - Map<String, Object> qrqcMap = new HashMap<String, Object>();  
995 - qrqcMap.put("name", "缺人缺车");  
996 - qrqcMap.put("value", qrqc);  
997 - glList.add(qrqcMap);  
998 - Map<String, Object> kxMap = new HashMap<String, Object>();  
999 - kxMap.put("name", "客稀");  
1000 - kxMap.put("value", kx);  
1001 - glList.add(kxMap); 990 + Map<String, Object> qrMap = new HashMap<String, Object>();
  991 + qrMap.put("name", "缺人");
  992 + qrMap.put("value", qr);
  993 + glList.add(qrMap);
  994 + Map<String, Object> qcMap = new HashMap<String, Object>();
  995 + qcMap.put("name", "验车");
  996 + qcMap.put("value", qr);
  997 + glList.add(qcMap);
  998 + Map<String, Object> byMap = new HashMap<String, Object>();
  999 + byMap.put("name", "保养");
  1000 + byMap.put("value", by);
  1001 + glList.add(byMap);
1002 Map<String, Object> qhMap = new HashMap<String, Object>(); 1002 Map<String, Object> qhMap = new HashMap<String, Object>();
1003 - qhMap.put("name", "气候"); 1003 + qhMap.put("name", "天气");
1004 qhMap.put("value", qh); 1004 qhMap.put("value", qh);
1005 glList.add(qhMap); 1005 glList.add(qhMap);
1006 Map<String, Object> ywMap = new HashMap<String, Object>(); 1006 Map<String, Object> ywMap = new HashMap<String, Object>();
1007 - ywMap.put("name", "援外"); 1007 + ywMap.put("name", "支援");
1008 ywMap.put("value", yw); 1008 ywMap.put("value", yw);
1009 glList.add(ywMap); 1009 glList.add(ywMap);
1010 Map<String, Object> qtMap = new HashMap<String, Object>(); 1010 Map<String, Object> qtMap = new HashMap<String, Object>();