|
@@ -8,6 +8,7 @@ import com.aoyang.tms.controller.param.TruckEscortListParam;
|
|
|
import com.aoyang.tms.entity.User;
|
|
import com.aoyang.tms.entity.User;
|
|
|
import com.aoyang.tms.entity.WorkSpot;
|
|
import com.aoyang.tms.entity.WorkSpot;
|
|
|
import com.aoyang.tms.service.CommonService;
|
|
import com.aoyang.tms.service.CommonService;
|
|
|
|
|
+import com.aoyang.tms.service.TruckDriverService;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
@@ -48,6 +49,8 @@ public class TruckEscortController {
|
|
|
private TruckEscortService truckEscortService;
|
|
private TruckEscortService truckEscortService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private CommonService commonService;
|
|
private CommonService commonService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private TruckDriverService truckDriverService;
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "获取车辆押运员分页列表", notes = "必传参数:orgId选填参数:keyWord(查escortName,mobile)")
|
|
@ApiOperation(value = "获取车辆押运员分页列表", notes = "必传参数:orgId选填参数:keyWord(查escortName,mobile)")
|
|
@@ -141,7 +144,13 @@ public class TruckEscortController {
|
|
|
if (param == null || param.getEscortId() == null) {
|
|
if (param == null || param.getEscortId() == null) {
|
|
|
return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
- commonService.deleteUser(param.getEscortId());
|
|
|
|
|
|
|
+
|
|
|
|
|
+ boolean delEscort = commonService.deleteUser(param.getEscortId());
|
|
|
|
|
+ log.info("删除车辆押运员,调用/tms/truck_escort/delete, deleteUser参数:{},结果:{}", JSON.toJSONString(param), JSON.toJSONString(delEscort));
|
|
|
|
|
+
|
|
|
|
|
+ boolean delTD = truckDriverService.delete(param.getEscortId());
|
|
|
|
|
+ log.info("删除车辆押运员,调用/tms/truck_escort/delete,delete参数:{},结果:{}", JSON.toJSONString(param), JSON.toJSONString(delTD));
|
|
|
|
|
+
|
|
|
return new Result<>(truckEscortService.removeById(param));
|
|
return new Result<>(truckEscortService.removeById(param));
|
|
|
}
|
|
}
|
|
|
|
|
|