diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java index 0984724..9b4b08a 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java @@ -499,4 +499,27 @@ public class SupDispatchCarController { return service.deleteFile(dto.getData()); } + + /** + * 审核附件 + * @param dto + * @return + */ + @PostMapping("examine") + @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) + public ServerResponse examine(EncryptedReq dto) { + return service.examine(dto.getData()); + } + + /** + * 提交审核 + * @param dto + * @return + */ + @PostMapping("toCheck") + @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) + public ServerResponse toCheck(EncryptedReq dto) { + return service.toCheck(dto.getData()); + } + } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java index 966c2b5..cf9be7c 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarNeedPlanVo.java @@ -191,4 +191,6 @@ public class CarNeedPlanVo extends ParentVo { */ private String licensePlate; + private String fileStatus; + } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java index ebad440..9355b96 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/SupDispatchCarMapper.java @@ -205,4 +205,18 @@ public interface SupDispatchCarMapper { * @return */ int deleteFile(CarPlanOutVo data); + + /** + * 审核 + * @param data + * @return + */ + int examine(CarPlanOutVo data); + + /** + * 提交审核 + * @param data + * @return + */ + int toCheck(CarPlanOutVo data); } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java index 79e8543..aa013da 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarService.java @@ -100,4 +100,18 @@ public interface SupDispatchCarService { * @return */ ServerResponse deleteFile(CarPlanOutVo data); + + /** + * 审核 + * @param data + * @return + */ + ServerResponse examine(CarPlanOutVo data); + + /** + * 派车审核 + * @param data + * @return + */ + ServerResponse toCheck(CarPlanOutVo data); } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java index e3ae12d..df81d92 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java @@ -642,5 +642,37 @@ public class SupDispatchCarServiceImpl implements SupDispatchCarService { } } + @Override + public ServerResponse examine(CarPlanOutVo data) { + try { + data.setId(data.getId()+"-dh"); + int res = mapper.examine(data); + if (res > 0){ + return ServerResponse.createSuccess("审核成功", "审核成功"); + } else { + return ServerResponse.createErroe("审核失败"); + } + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("审核失败"); + } + } + + @Override + public ServerResponse toCheck(CarPlanOutVo data) { + try { + data.setId(data.getId()+"-dh"); + int res = mapper.toCheck(data); + if (res > 0){ + return ServerResponse.createSuccess("提交成功", "提交成功"); + } else { + return ServerResponse.createErroe("提交失败"); + } + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("提交失败"); + } + } + } diff --git a/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java b/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java index f689db7..938912c 100644 --- a/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java +++ b/src/main/java/com/bonus/gzcar/business/system/entity/FileUploadVo.java @@ -54,5 +54,7 @@ public class FileUploadVo { */ private String type; + private String status; + } diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index cfe3987..3b46afb 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -95,6 +95,15 @@ WHERE id= #{planId} + + update bm_file_upload set status=#{status} + WHERE own_id= #{id} and model_table='car_plan_out' and type='到货确认单' + + + update bm_file_upload set status=0 + WHERE own_id= #{id} and model_table='car_plan_out' and type='到货确认单' + + delete from car_plan_out @@ -307,12 +316,19 @@