潘钊 / bsth_control · Commits

Commit b683841652202437211818c9a24143f3b2cd8cf9

Authored by 王通
2 parents b19f44d4 4d865d7b
build: skipped

Merge remote-tracking branch 'origin/qingpu_20180808' into qingpu_20180808

Inline Side-by-side
Showing 5 changed files with 89 additions and 12 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
  View file @b683841
... ... @@ -76,12 +76,13 @@ public class GpsController {
76 76 Map<String, VehicleArrivalStopRealMonitorDto> arrivalStopRealMonitorMap = new HashMap<>();
77 77 if (lateReminderServiceFacade == null) {
78 78 LOG.warn("LateReminderServiceFacade服务未导入，请检查dubbo相关配置！");
79   - }
80   - try {
81   - // 按照车牌作为key，映射map
82   - arrivalStopRealMonitorMap.putAll(lateReminderServiceFacade.getVehicleArrivalStopRealMonitorInfo_cph(lineArray));
83   - } catch (Exception exp) {
84   - LOG.warn("LateReminderServiceFacade远端调用异常，请检查dubbo服务部署情况！", exp);
  79 + } else {
  80 + try {
  81 + // 按照车牌作为key，映射map
  82 + arrivalStopRealMonitorMap.putAll(lateReminderServiceFacade.getVehicleArrivalStopRealMonitorInfo_cph(lineArray));
  83 + } catch (Exception exp) {
  84 + LOG.warn("LateReminderServiceFacade远端调用异常，请检查dubbo服务部署情况！message={}", exp.getLocalizedMessage());
  85 + }
85 86 }
86 87  
87 88 rs.put("gpsList", gpsList);
... ...
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
  View file @b683841
... ... @@ -307,6 +307,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
307 307  
308 308 String realMileage = "", oil = "0", addOil = "0", consume = "", cr = "";
309 309 String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "";
  310 + String remarks = "";
310 311  
311 312 Double sjgl = culateMileageService.culateSjgl(list2);
312 313 Double ksgl = culateMileageService.culateKsgl(list2);
... ... @@ -331,6 +332,31 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
331 332 bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
332 333 cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
333 334  
  335 + for(ScheduleRealInfo s : list2){
  336 + String remark = "";
  337 + if(s.getRemarks() != null){
  338 + remark += s.getRemarks().trim();
  339 + }
  340 + if (s.isDestroy()) {
  341 + remark += "(烂班)";
  342 + }
  343 + if(remark.length() > 0 && remarks.length() > 0){
  344 + remarks += ";";
  345 + }
  346 + remarks += remark;
  347 + Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
  348 + for(ChildTaskPlan c : childTaskPlans){
  349 + remark = "";
  350 + if(c.getRemarks() != null){
  351 + remark = c.getRemarks().trim();
  352 + }
  353 + if(remark.length() > 0 && remarks.length() > 0){
  354 + remarks += ";";
  355 + }
  356 + remarks += remark;
  357 + }
  358 + }
  359 +
334 360 List<Refuel> refuels = repository.selectByCarAndDriver(date, split[0], split[1]);
335 361 Refuel r = new Refuel();
336 362  
... ... @@ -479,7 +505,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
479 505 m.put("yw", ""); //业务
480 506 m.put("cj", ""); //车间
481 507 m.put("cr", cr);
482   - m.put("remark", "");
  508 + m.put("remark", remarks);
483 509  
484 510 resList.add(m);
485 511  
... ... @@ -638,6 +664,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
638 664  
639 665 String realMileage = "", ksMileage = "", ssMileage = "",
640 666 bc = "", jhbc = "", sjbc = "", cr = "";
  667 + String remarks = "";
641 668  
642 669 Double sjgl = culateMileageService.culateSjgl(list2);
643 670 Double ksgl = culateMileageService.culateKsgl(list2);
... ... @@ -662,6 +689,31 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
662 689 bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
663 690 cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
664 691  
  692 + for(ScheduleRealInfo s : list2){
  693 + String remark = "";
  694 + if(s.getRemarks() != null){
  695 + remark += s.getRemarks().trim();
  696 + }
  697 + if (s.isDestroy()) {
  698 + remark += "(烂班)";
  699 + }
  700 + if(remark.length() > 0 && remarks.length() > 0){
  701 + remarks += ";";
  702 + }
  703 + remarks += remark;
  704 + Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
  705 + for(ChildTaskPlan c : childTaskPlans){
  706 + remark = "";
  707 + if(c.getRemarks() != null){
  708 + remark = c.getRemarks().trim();
  709 + }
  710 + if(remark.length() > 0 && remarks.length() > 0){
  711 + remarks += ";";
  712 + }
  713 + remarks += remark;
  714 + }
  715 + }
  716 +
665 717 m.put("date", scheList.get(0).getScheduleDateStr());
666 718 m.put("line", list2.get(0).getXlName());
667 719 m.put("car", split[0]);
... ... @@ -678,7 +730,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
678 730 m.put("jhbc", jhbc);
679 731 m.put("sjbc", sjbc);
680 732 m.put("cr", cr);
681   - m.put("remark", "");
  733 + m.put("remark", remarks);
682 734  
683 735 resList.add(m);
684 736 }
... ...
src/main/resources/static/pages/forms/statement/refuelDc.html
  View file @b683841
... ... @@ -232,7 +232,15 @@
232 232 <td>{{obj.ssMileage}}</td>
233 233 <td>{{obj.bc}}</td>
234 234 <td>{{obj.cr}}</td>
235   - <td>{{obj.remark}}</td>
  235 + <td title="{{obj.remark}}">
  236 + {{if obj.remark !=""}}
  237 + <div class="caption">
  238 +
  239 + <font style="font-size: 24px;font-weight: bold;">！</font>
  240 +
  241 + </div>
  242 + {{/if}}
  243 + </td>
236 244 </tr>
237 245 {{/each}}
238 246 {{if list.length == 0}}
... ...
src/main/resources/static/pages/forms/statement/refuelYc.html
  View file @b683841
... ... @@ -239,7 +239,15 @@
239 239 <td>{{obj.ssMileage}}</td>
240 240 <td>{{obj.bc}}</td>
241 241 <td>{{obj.cr}}</td>
242   - <td>{{obj.remark}}</td>
  242 + <td title="{{obj.remark}}">
  243 + {{if obj.remark !=""}}
  244 + <div class="caption">
  245 +
  246 + <font style="font-size: 24px;font-weight: bold;">！</font>
  247 +
  248 + </div>
  249 + {{/if}}
  250 + </td>
243 251 </tr>
244 252 {{/each}}
245 253 {{if list.length == 0}}
... ...
src/main/resources/static/pages/forms/statement/waybillQp.html
  View file @b683841
... ... @@ -234,10 +234,18 @@
234 234 var zdsjActual = (obj.zdsjActual).split(":");
235 235 var zdsj = (obj.zdsj).split(":");
236 236 if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
237   - obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  237 + if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
  238 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
  239 + } else {
  240 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  241 + }
238 242 }
239 243 else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
240   - obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  244 + if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
  245 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
  246 + } else {
  247 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  248 + }
241 249 }
242 250 }
243 251 });
... ...