|
|
@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
@ -15,6 +16,8 @@ import jnpf.base.vo.PageListVO;
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
|
|
|
import jnpf.poundlist.entity.PoundlistEntity;
|
|
|
|
|
|
|
|
import jnpf.poundlist.service.PoundlistService;
|
|
|
|
import jnpf.util.*;
|
|
|
|
import jnpf.util.*;
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
@ -63,6 +66,9 @@ public class VehicleController {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private VehicleService vehicleService;
|
|
|
|
private VehicleService vehicleService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private PoundlistService poundlistService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -317,9 +323,14 @@ public class VehicleController {
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public ActionResult delete(@PathVariable("id") String id){
|
|
|
|
public ActionResult delete(@PathVariable("id") String id){
|
|
|
|
VehicleEntity entity= vehicleService.getInfo(id);
|
|
|
|
VehicleEntity entity= vehicleService.getInfo(id);
|
|
|
|
|
|
|
|
QueryWrapper<PoundlistEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
|
|
|
queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id);
|
|
|
|
|
|
|
|
List<PoundlistEntity> poundlistEntityList = poundlistService.list(queryWrapper);
|
|
|
|
|
|
|
|
if (poundlistEntityList.size()>0){
|
|
|
|
|
|
|
|
return ActionResult.fail("该车辆已被使用,无法删除");
|
|
|
|
|
|
|
|
}
|
|
|
|
if(entity!=null){
|
|
|
|
if(entity!=null){
|
|
|
|
vehicleService.delete(entity);
|
|
|
|
vehicleService.delete(entity);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|