From 839e2a4143f2e2a51052d51a8e5372b69454fa0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Wed, 28 May 2025 10:48:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E5=85=AC=E5=8A=A1?= =?UTF-8?q?=E7=94=A8=E8=BD=A6=E5=87=BA=E5=8E=BF=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VehicleRequestController.java | 15 +++++++ .../domain/dto/VehicleRequesApprovaltDto.java | 11 +++++ .../domain/dto/VehicleRequestDto.java | 42 ------------------- 3 files changed, 26 insertions(+), 42 deletions(-) create mode 100644 gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequesApprovaltDto.java diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/VehicleRequestController.java b/gather-app/src/main/java/com/ruoyi/business/controller/VehicleRequestController.java index 34d98ae..3b031e8 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/VehicleRequestController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/VehicleRequestController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.database.domain.VehicleRequest; +import com.ruoyi.database.domain.dto.VehicleRequesApprovaltDto; import com.ruoyi.database.service.VehicleRequestService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -88,4 +89,18 @@ public class VehicleRequestController extends BaseController { VehicleRequest vehicleRequest = vehicleRequestService.getById(id); return AjaxResult.success(vehicleRequest); } + + @ApiOperation("审批公务用车出县申请") + @PostMapping("/approval") + public AjaxResult approval(@RequestBody VehicleRequesApprovaltDto dto) { + Long id = dto.getId(); + Integer state = dto.getState(); + VehicleRequest vehicleRequest = vehicleRequestService.getById(id); + vehicleRequest.setState(state); + boolean result = vehicleRequestService.updateById(vehicleRequest); + if (!result) { + return AjaxResult.error("审批公务用车出县申请失败"); + } + return AjaxResult.success("审批公务用车出县申请成功"); + } } diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequesApprovaltDto.java b/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequesApprovaltDto.java new file mode 100644 index 0000000..628d13d --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequesApprovaltDto.java @@ -0,0 +1,11 @@ +package com.ruoyi.database.domain.dto; + + +import lombok.Data; + +@Data +public class VehicleRequesApprovaltDto { + + private Long id; + private Integer state; +} diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequestDto.java b/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequestDto.java index e03a4b8..36ccb29 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequestDto.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequestDto.java @@ -1,9 +1,6 @@ package com.ruoyi.database.domain.dto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,107 +9,68 @@ import java.time.LocalDateTime; @Data public class VehicleRequestDto { - @TableId(value = "id",type = IdType.AUTO) private Long id; - @ApiModelProperty("申请单位") private Long deptId; - @ApiModelProperty("申请单位名称") private Long deptName; - @ApiModelProperty("申请人姓名") private String appName; - @ApiModelProperty("申请人警号") private String badgeNumber; - @ApiModelProperty("申请人联系方式") private String appPhone; - @ApiModelProperty("申请日期") - @JsonFormat(pattern = "yyyy年MM月dd日") private LocalDateTime appDate; - @ApiModelProperty("用车开始时间") - @JsonFormat(pattern = "yyyy年MM月dd日 HH:mm") private LocalDateTime startTime; - @ApiModelProperty("用车结束时间") - @JsonFormat(pattern = "yyyy年MM月dd日 HH:mm") private LocalDateTime endTime; - @ApiModelProperty("出县开始时间") - @JsonFormat(pattern = "yyyy年MM月dd日 HH:mm") private LocalDateTime goTime; - @ApiModelProperty("出县结束时间") - @JsonFormat(pattern = "yyyy年MM月dd日 HH:mm") private LocalDateTime backTime; - @ApiModelProperty("车牌号") private String carNumber; - @ApiModelProperty("车型") private String carType; - @ApiModelProperty("驾驶员id") private String driverId; - @ApiModelProperty("驾驶员姓名") private String driverName; - @ApiModelProperty("驾驶证号") private String permitNumber; - @ApiModelProperty("目的地") private String destination; - @ApiModelProperty("是否跨省") private Integer crossProvinces; - @ApiModelProperty("路线规划") private String routePlanning; - @ApiModelProperty("用车事由") private String useCarReason; - @ApiModelProperty("携带物品") private String carry; - @ApiModelProperty("涉密文件密级") private String level; - @ApiModelProperty("份数") private Integer number; - @ApiModelProperty("文件编号") private String fileCode; - @ApiModelProperty("随行人员姓名") private String entourage; - @ApiModelProperty("随行人员警号") private String entourageBadgeNumber; - @ApiModelProperty("随行人员职务") private String entourageDuty; - @ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过") private Integer state; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("创建时间") private LocalDateTime createTime; - @ApiModelProperty("创建人") private String createBy; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("修改时间") private LocalDateTime updateTime; - @ApiModelProperty("修改人") private String updateBy; }