潘钊 / bsth_control · Commits

Commit 4f99d1c71b93bc0a5b5f866cb6780bca70c72940

Authored by 娄高锋
1 parent ba6cc6b7
build: skipped

闵行调度报表，烂班类型修改。

Inline Side-by-side
Showing 4 changed files with 43 additions and 59 deletions
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
  View file @4f99d1c
... ... @@ -236,21 +236,16 @@ public class CalcToolServiceImpl implements CalcToolService {
236 236 int lbbc=culateMileageService.culateLbbc(list_);
237 237 double lblc=culateMileageService.culateLbgl(list_);
238 238 double ssgl_lz= culateMileageService.culateCJLC(list_, "路阻");
239   - double ssgl_dm= culateMileageService.culateCJLC(list_, "吊慢");
  239 + double ssgl_dm= culateMileageService.culateCJLC(list_, "借调");
240 240 double ssgl_gz= culateMileageService.culateCJLC(list_, "故障");
241 241 double ssgl_jf= culateMileageService.culateCJLC(list_, "纠纷");
242   - double ssgl_zs= culateMileageService.culateCJLC(list_, "肇事");
  242 + double ssgl_zs= culateMileageService.culateCJLC(list_, "事故");
243 243 double ssgl_qr= culateMileageService.culateCJLC(list_, "缺人");
244   - double ssgl_qc= culateMileageService.culateCJLC(list_, "缺车");
245   - double ssgl_kx= culateMileageService.culateCJLC(list_, "客稀");
246   - double ssgl_qh= culateMileageService.culateCJLC(list_, "气候");
247   - double ssgl_yw= culateMileageService.culateCJLC(list_, "援外");
248   -
249   - double ssgl_pc=culateMileageService.culateCJLC(list_, "配车");
250   - double ssgl_by=culateMileageService.culateCJLC(list_, "保养");
251   - double ssgl_cj=culateMileageService.culateCJLC(list_, "抽减");
252   - double ssgl_qt=culateMileageService.culateCJLC(list_, "其他");
253   - double ssgl_qtz=Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj,ssgl_qt));
  244 + double ssgl_qc= culateMileageService.culateCJLC(list_, "验车");
  245 + double ssgl_kx= culateMileageService.culateCJLC(list_, "保养");
  246 + double ssgl_qh= culateMileageService.culateCJLC(list_, "天气");
  247 + double ssgl_yw= culateMileageService.culateCJLC(list_, "支援");
  248 + double ssgl_qtz=culateMileageService.culateCJLC(list_, "其他");
254 249 int fzbc=culateMileageService.culateDtfzbc(list_s, "major", "");//放站
255 250 int fzbcZgf=culateMileageService.culateDtfzbc(list_s, "major", "zgf");
256 251 int fzbcWgf=culateMileageService.culateDtfzbc(list_s, "major", "wgf");
... ...
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @4f99d1c
... ... @@ -666,20 +666,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
666 666 // }
667 667  
668 668 s.setLzlc(culateService.culateCJLC(list, "路阻"));
669   - s.setDmlc(culateService.culateCJLC(list, "吊慢"));
  669 + s.setDmlc(culateService.culateCJLC(list, "借调"));
670 670 s.setGzlc(culateService.culateCJLC(list, "故障"));
671 671 s.setJflc(culateService.culateCJLC(list, "纠纷"));
672   - s.setZslc(culateService.culateCJLC(list, "肇事"));
  672 + s.setZslc(culateService.culateCJLC(list, "事故"));
673 673 s.setQrlc(culateService.culateCJLC(list, "缺人"));
674   - s.setQclc(culateService.culateCJLC(list, "缺车"));
675   - s.setKxlc(culateService.culateCJLC(list, "客稀"));
676   - s.setQhlc(culateService.culateCJLC(list, "气候"));
677   - s.setYwlc(culateService.culateCJLC(list, "援外"));
678   - double ssgl_pc=culateService.culateCJLC(list, "配车");
679   - double ssgl_by=culateService.culateCJLC(list, "保养");
680   - double ssgl_cj=culateService.culateCJLC(list, "抽减");
681   - double ssgl_qt=culateService.culateCJLC(list, "其他");
682   - s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
  674 + s.setQclc(culateService.culateCJLC(list, "验车"));
  675 + s.setKxlc(culateService.culateCJLC(list, "保养"));
  676 + s.setQhlc(culateService.culateCJLC(list, "天气"));
  677 + s.setYwlc(culateService.culateCJLC(list, "支援"));
  678 + s.setQtlc(culateService.culateCJLC(list, "其他"));
683 679 s.setLjlc(ljgl);
684 680  
685 681 s.setJhbcq(culateService.culateJhbc(list,""));
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @4f99d1c
... ... @@ -2803,20 +2803,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2803 2803 }
2804 2804  
2805 2805 map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
2806   - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
  2806 + map.put("ssgl_dm", culateService.culateCJLC(list, "借调"));
2807 2807 map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
2808 2808 map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
2809   - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
  2809 + map.put("ssgl_zs", culateService.culateCJLC(list, "事故"));
2810 2810 map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
2811   - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
2812   - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
2813   - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
2814   - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
2815   - double ssgl_pc = culateService.culateCJLC(list, "配车");
2816   - double ssgl_by = culateService.culateCJLC(list, "保养");
2817   - double ssgl_cj = culateService.culateCJLC(list, "抽减");
2818   - double ssgl_qt = culateService.culateCJLC(list, "其他");
2819   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  2811 + map.put("ssgl_qc", culateService.culateCJLC(list, "验车"));
  2812 + map.put("ssgl_kx", culateService.culateCJLC(list, "保养"));
  2813 + map.put("ssgl_qh", culateService.culateCJLC(list, "天气"));
  2814 + map.put("ssgl_yw", culateService.culateCJLC(list, "支援"));
  2815 + map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
2820 2816 map.put("ssbc", culateService.culateLbbc(list));
2821 2817 map.put("ljgl", ljgl);
2822 2818 map.put("jhbc", culateService.culateJhbc(list, ""));
... ... @@ -3135,20 +3131,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3135 3131 map.put("zt", 1);
3136 3132 }
3137 3133 map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
3138   - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
  3134 + map.put("ssgl_dm", culateService.culateCJLC(list, "借调"));
3139 3135 map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
3140 3136 map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
3141   - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
  3137 + map.put("ssgl_zs", culateService.culateCJLC(list, "事故"));
3142 3138 map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
3143   - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
3144   - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
3145   - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
3146   - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
3147   - double ssgl_pc = culateService.culateCJLC(list, "配车");
3148   - double ssgl_by = culateService.culateCJLC(list, "保养");
3149   - double ssgl_cj = culateService.culateCJLC(list, "抽减");
3150   - double ssgl_qt = culateService.culateCJLC(list, "其他");
3151   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  3139 + map.put("ssgl_qc", culateService.culateCJLC(list, "验车"));
  3140 + map.put("ssgl_kx", culateService.culateCJLC(list, "保养"));
  3141 + map.put("ssgl_qh", culateService.culateCJLC(list, "天气"));
  3142 + map.put("ssgl_yw", culateService.culateCJLC(list, "支援"));
  3143 + map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
3152 3144  
3153 3145 map.put("ssbc", culateService.culateLbbc(list));
3154 3146 map.put("ljgl", ljgl);
... ... @@ -3220,23 +3212,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3220 3212 ssgl += childTaskPlan.getMileage();
3221 3213 if (childTaskPlan.getDestroyReason().equals("路阻")) {
3222 3214 ssgl_lz += childTaskPlan.getMileage();
3223   - } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
  3215 + } else if (childTaskPlan.getDestroyReason().equals("借调")) {
3224 3216 ssgl_dm += childTaskPlan.getMileage();
3225 3217 } else if (childTaskPlan.getDestroyReason().equals("故障")) {
3226 3218 ssgl_gz += childTaskPlan.getMileage();
3227 3219 } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
3228 3220 ssgl_jf += childTaskPlan.getMileage();
3229   - } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
  3221 + } else if (childTaskPlan.getDestroyReason().equals("事故")) {
3230 3222 ssgl_zs += childTaskPlan.getMileage();
3231 3223 } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
3232 3224 ssgl_qr += childTaskPlan.getMileage();
3233   - } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
  3225 + } else if (childTaskPlan.getDestroyReason().equals("验车")) {
3234 3226 ssgl_qc += childTaskPlan.getMileage();
3235   - } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
  3227 + } else if (childTaskPlan.getDestroyReason().equals("保养")) {
3236 3228 ssgl_kx += childTaskPlan.getMileage();
3237   - } else if (childTaskPlan.getDestroyReason().equals("气候")) {
  3229 + } else if (childTaskPlan.getDestroyReason().equals("天气")) {
3238 3230 ssgl_qh += childTaskPlan.getMileage();
3239   - } else if (childTaskPlan.getDestroyReason().equals("援外")) {
  3231 + } else if (childTaskPlan.getDestroyReason().equals("支援")) {
3240 3232 ssgl_yw += childTaskPlan.getMileage();
3241 3233 } else {
3242 3234 ssgl_other += childTaskPlan.getMileage();
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @4f99d1c
... ... @@ -1671,7 +1671,8 @@ public class ReportServiceImpl implements ReportService{
1671 1671 @Override
1672 1672 public List<Map<String, Object>> jobFwqk(Map<String, Object> map) {
1673 1673 // TODO Auto-generated method stub
1674   - String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
  1674 +// String[] lblxs = {"配车","保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
  1675 + String[] lblxs = {"路阻","借调","故障","纠纷","事故","缺人","验车","保养","天气","支援","其他"};
1675 1676 String line=map.get("line").toString();
1676 1677 String date=map.get("date").toString();
1677 1678 map.put("bcType", "normal");
... ... @@ -2694,20 +2695,20 @@ public class ReportServiceImpl implements ReportService{
2694 2695 double lbss=culateService.culateSsMile(list);//烂班少驶
2695 2696 map.put("lbss", lbss);
2696 2697 map.put("ssgl_lz", culateService.culateSsMileXx(list, "路阻"));
2697   - map.put("ssgl_dm", culateService.culateSsMileXx(list, "吊慢"));
  2698 + map.put("ssgl_dm", culateService.culateSsMileXx(list, "借调"));
2698 2699 map.put("ssgl_gz", culateService.culateSsMileXx(list, "故障"));
2699 2700 map.put("ssgl_jf", culateService.culateSsMileXx(list, "纠纷"));
2700   - map.put("ssgl_zs", culateService.culateSsMileXx(list, "肇事"));
  2701 + map.put("ssgl_zs", culateService.culateSsMileXx(list, "事故"));
2701 2702 map.put("ssgl_qr", culateService.culateSsMileXx(list, "缺人"));
2702   - map.put("ssgl_qc", culateService.culateSsMileXx(list, "缺车"));
2703   - map.put("ssgl_kx", culateService.culateSsMileXx(list, "客稀"));
2704   - map.put("ssgl_qh", culateService.culateSsMileXx(list, "气候"));
2705   - map.put("ssgl_yw", culateService.culateSsMileXx(list, "援外"));
  2703 + map.put("ssgl_qc", culateService.culateSsMileXx(list, "验车"));
  2704 + map.put("ssgl_kx", culateService.culateSsMileXx(list, "保养"));
  2705 + map.put("ssgl_qh", culateService.culateSsMileXx(list, "天气"));
  2706 + map.put("ssgl_yw", culateService.culateSsMileXx(list, "支援"));
2706 2707 map.put("ssgl_other", culateService.culateSsMileXx(list, "其他"));
2707 2708  
2708 2709  
2709 2710 double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
2710   - double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
  2711 + double zrwjcclc1=Arith.add(culateService.culateZrwJccLc(list, "肇事"), culateService.culateZrwJccLc(list, "事故"));
2711 2712 double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
2712 2713 double zrwjcclcqt=Arith.add(culateService.culateZrwJccLc(list, "其他"),culateService.culateZrwJccLc(list, ""));
2713 2714 map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt));
... ...