feat: 审批公务用车出县申请

This commit is contained in:
李京通 2025-05-28 10:48:09 +08:00
parent f9d69b7c10
commit 839e2a4143
3 changed files with 26 additions and 42 deletions

View File

@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.database.domain.VehicleRequest; import com.ruoyi.database.domain.VehicleRequest;
import com.ruoyi.database.domain.dto.VehicleRequesApprovaltDto;
import com.ruoyi.database.service.VehicleRequestService; import com.ruoyi.database.service.VehicleRequestService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -88,4 +89,18 @@ public class VehicleRequestController extends BaseController {
VehicleRequest vehicleRequest = vehicleRequestService.getById(id); VehicleRequest vehicleRequest = vehicleRequestService.getById(id);
return AjaxResult.success(vehicleRequest); 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("审批公务用车出县申请成功");
}
} }

View File

@ -0,0 +1,11 @@
package com.ruoyi.database.domain.dto;
import lombok.Data;
@Data
public class VehicleRequesApprovaltDto {
private Long id;
private Integer state;
}

View File

@ -1,9 +1,6 @@
package com.ruoyi.database.domain.dto; 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 io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -12,107 +9,68 @@ import java.time.LocalDateTime;
@Data @Data
public class VehicleRequestDto { public class VehicleRequestDto {
@TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
@ApiModelProperty("申请单位")
private Long deptId; private Long deptId;
@ApiModelProperty("申请单位名称")
private Long deptName; private Long deptName;
@ApiModelProperty("申请人姓名")
private String appName; private String appName;
@ApiModelProperty("申请人警号")
private String badgeNumber; private String badgeNumber;
@ApiModelProperty("申请人联系方式")
private String appPhone; private String appPhone;
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy年MM月dd日")
private LocalDateTime appDate; private LocalDateTime appDate;
@ApiModelProperty("用车开始时间")
@JsonFormat(pattern = "yyyy年MM月dd日 HH:mm")
private LocalDateTime startTime; private LocalDateTime startTime;
@ApiModelProperty("用车结束时间")
@JsonFormat(pattern = "yyyy年MM月dd日 HH:mm")
private LocalDateTime endTime; private LocalDateTime endTime;
@ApiModelProperty("出县开始时间")
@JsonFormat(pattern = "yyyy年MM月dd日 HH:mm")
private LocalDateTime goTime; private LocalDateTime goTime;
@ApiModelProperty("出县结束时间")
@JsonFormat(pattern = "yyyy年MM月dd日 HH:mm")
private LocalDateTime backTime; private LocalDateTime backTime;
@ApiModelProperty("车牌号")
private String carNumber; private String carNumber;
@ApiModelProperty("车型")
private String carType; private String carType;
@ApiModelProperty("驾驶员id")
private String driverId; private String driverId;
@ApiModelProperty("驾驶员姓名")
private String driverName; private String driverName;
@ApiModelProperty("驾驶证号")
private String permitNumber; private String permitNumber;
@ApiModelProperty("目的地")
private String destination; private String destination;
@ApiModelProperty("是否跨省")
private Integer crossProvinces; private Integer crossProvinces;
@ApiModelProperty("路线规划")
private String routePlanning; private String routePlanning;
@ApiModelProperty("用车事由")
private String useCarReason; private String useCarReason;
@ApiModelProperty("携带物品")
private String carry; private String carry;
@ApiModelProperty("涉密文件密级")
private String level; private String level;
@ApiModelProperty("份数")
private Integer number; private Integer number;
@ApiModelProperty("文件编号")
private String fileCode; private String fileCode;
@ApiModelProperty("随行人员姓名")
private String entourage; private String entourage;
@ApiModelProperty("随行人员警号")
private String entourageBadgeNumber; private String entourageBadgeNumber;
@ApiModelProperty("随行人员职务")
private String entourageDuty; private String entourageDuty;
@ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过")
private Integer state; private Integer state;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty("创建人")
private String createBy; private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private LocalDateTime updateTime; private LocalDateTime updateTime;
@ApiModelProperty("修改人")
private String updateBy; private String updateBy;
} }