潘钊 / bsth_control · Commits

Commit f986659c61f4ff249b7d7c03b854e4a4ff2067e0

Authored by 潘钊
1 parent 031c9662

update...

Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
  View file @f986659
1 1 package com.bsth.service.realcontrol.impl;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.bsth.common.ResponseCode;
4 5 import com.bsth.data.BasicData;
5 6 import com.bsth.data.Station2ParkBuffer;
... ... @@ -137,6 +138,8 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Lon
137 138 Map<String, Object> rs = new HashMap();
138 139 try {
139 140 ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
  141 + logger.info("cts: " + JSON.toJSONString(t));
  142 + logger.info("sch: " + JSON.toJSONString(sch));
140 143 //保存起终点名称
141 144 if(StringUtils.isEmpty(t.getStartStationName()))
142 145 t.setStartStationName(getStationName(sch.getXlBm(), t.getStartStation()));
... ... @@ -151,7 +154,7 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
151 154 ChildTaskPlan task = null;
152 155 Set<ChildTaskPlan> set = sch.getcTasks();
153 156 for(ChildTaskPlan obj : set){
154   - if(obj.getId() == t.getId()){
  157 + if(obj.getId().intValue() == t.getId().intValue()){
155 158 task = obj;
156 159 break;
157 160 }
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @f986659
... ... @@ -275,8 +275,10 @@
275 275 //检查子任务营运里程
276 276 $('#childTaskTitle .child-task-status', modal).remove();
277 277 //var i = 0;
278   - if (sch.cTasks.length == 0)
  278 + if (sch.cTasks.length == 0){
  279 + $('.uk-panel-box-secondary', modal).removeClass('c_task_mileage_abnormal');
279 280 return;
  281 + }
280 282 var sum = 0, calcs = ' ';
281 283 $.each(sch.cTasks, function () {
282 284 if (this.mileageType == 'service') {
... ...