Commit d819c2caed3fba2e837d17f5eba5ef5efda98501
1 parent
f5fa0e8d
Merge branch 'pudong' into pudong_jdk8
# Conflicts: # src/main/java/com/bsth/data/report_register/entity/ReportRegister.java # src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
Showing
1 changed file
with
2 additions
and
6 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| ... | ... | @@ -264,8 +264,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf |
| 264 | 264 | * 校验人车 和 班次的公司和分公司归属 |
| 265 | 265 | * |
| 266 | 266 | * @param schId |
| 267 | - * @param jsy | |
| 268 | - * @param spy | |
| 267 | + * @param jGh | |
| 268 | + * @param sGh | |
| 269 | 269 | * @param nbbm |
| 270 | 270 | * @return -2 跨营运公司，校验不过 |
| 271 | 271 | * -1 跨分公司，二次确认 |
| ... | ... | @@ -2657,11 +2657,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf |
| 2657 | 2657 | @Override |
| 2658 | 2658 | public Map<String, Object> removeChildTask(Long taskId) { |
| 2659 | 2659 | Map<String, Object> rs = new HashMap<>(); |
| 2660 | -<<<<<<<HEAD | |
| 2661 | 2660 | ChildTaskPlan chTask = cTaskPlanRepository.findById(taskId).get(); |
| 2662 | -======= | |
| 2663 | - ChildTaskPlan chTask = cTaskPlanRepository.findOne(taskId); | |
| 2664 | ->>>>>>> pudong | |
| 2665 | 2661 | |
| 2666 | 2662 | ScheduleRealInfo sch = dayOfSchedule.get(chTask.getSchedule().getId()); |
| 2667 | 2663 | try { | ... | ... |