|
@ -157,6 +157,9 @@ public class BPSLTask extends AbstractTask { |
|
|
throw new BadRequestException("该任务已取消!"); |
|
|
throw new BadRequestException("该任务已取消!"); |
|
|
} |
|
|
} |
|
|
String startPoint = taskObj.getPoint_code1(); // 获取起点
|
|
|
String startPoint = taskObj.getPoint_code1(); // 获取起点
|
|
|
|
|
|
if(startPoint.startsWith("ZJBDJW")){ |
|
|
|
|
|
startPoint=startPoint.substring(0,startPoint.length()-2); |
|
|
|
|
|
} |
|
|
String endPoint = taskObj.getPoint_code2(); // 获取终点
|
|
|
String endPoint = taskObj.getPoint_code2(); // 获取终点
|
|
|
SchBasePoint startPointObj = pointService.getById(startPoint); |
|
|
SchBasePoint startPointObj = pointService.getById(startPoint); |
|
|
SchBasePoint endPointObj = pointService.getById(endPoint); |
|
|
SchBasePoint endPointObj = pointService.getById(endPoint); |
|
@ -205,7 +208,7 @@ public class BPSLTask extends AbstractTask { |
|
|
pointMapper.updatePointType(endPointObj.getPoint_code().substring(0,endPointObj.getPoint_code().length()-2),"1"); |
|
|
pointMapper.updatePointType(endPointObj.getPoint_code().substring(0,endPointObj.getPoint_code().length()-2),"1"); |
|
|
// 任务完成
|
|
|
// 任务完成
|
|
|
taskObj.setTask_status(TaskStatus.FINISHED.getCode()); |
|
|
taskObj.setTask_status(TaskStatus.FINISHED.getCode()); |
|
|
taskObj.setGroup_id(one.getGroup_id()); |
|
|
// taskObj.setGroup_id(one.getGroup_id());
|
|
|
taskObj.setRemark("任务完成"); |
|
|
taskObj.setRemark("任务完成"); |
|
|
} |
|
|
} |
|
|
if (status.equals(TaskStatus.CANCELED)) { // 取消
|
|
|
if (status.equals(TaskStatus.CANCELED)) { // 取消
|
|
|