From c8bad7743fb780864d0b156e8bc52578310bcd21 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 09:49:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=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 | 45 +++++++ .../ruoyi/database/domain/VehicleRequest.java | 23 ++++ .../domain/dto/VehicleRequestDto.java | 118 ++++++++++++++++++ .../database/mapper/VehicleRequestMapper.java | 14 +++ .../service/VehicleRequestService.java | 12 ++ .../impl/VehicleRequestServiceImpl.java | 16 +++ 6 files changed, 228 insertions(+) create mode 100644 gather-app/src/main/java/com/ruoyi/business/controller/VehicleRequestController.java create mode 100644 gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequestDto.java create mode 100644 gather-app/src/main/java/com/ruoyi/database/mapper/VehicleRequestMapper.java create mode 100644 gather-app/src/main/java/com/ruoyi/database/service/VehicleRequestService.java create mode 100644 gather-app/src/main/java/com/ruoyi/database/service/impl/VehicleRequestServiceImpl.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 new file mode 100644 index 0000000..cf48626 --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/business/controller/VehicleRequestController.java @@ -0,0 +1,45 @@ +package com.ruoyi.business.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.database.domain.VehicleRequest; +import com.ruoyi.database.service.VehicleRequestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description VehicleRequestController + * @Author lijingtong + * @Date 2025-05-28 + */ + +@RestController +@RequiredArgsConstructor +@RequestMapping("/business/vehicleRequest") +@Api(tags = "公务用车出县申请") +public class VehicleRequestController extends BaseController { + private final VehicleRequestService vehicleRequestService; + + @ApiOperation("新增公务用车出县申请") + @RequestMapping("/add") + public AjaxResult add(@RequestBody VehicleRequest vehicleRequest) { + if (vehicleRequest.getId()==null){ + boolean result = vehicleRequestService.save(vehicleRequest); + if (!result){ + return AjaxResult.error("新增公务用车出县申请失败"); + } + return AjaxResult.success(result); + }else { + boolean result = vehicleRequestService.updateById(vehicleRequest); + if (!result){ + return AjaxResult.error("修改公务用车出县申请失败"); + } + return AjaxResult.success(result); + } + + } +} diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/VehicleRequest.java b/gather-app/src/main/java/com/ruoyi/database/domain/VehicleRequest.java index d74807f..7ab2818 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/VehicleRequest.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/VehicleRequest.java @@ -92,4 +92,27 @@ public class VehicleRequest { @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; } 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 new file mode 100644 index 0000000..e03a4b8 --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/domain/dto/VehicleRequestDto.java @@ -0,0 +1,118 @@ +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; + +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; +} diff --git a/gather-app/src/main/java/com/ruoyi/database/mapper/VehicleRequestMapper.java b/gather-app/src/main/java/com/ruoyi/database/mapper/VehicleRequestMapper.java new file mode 100644 index 0000000..f56675c --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/mapper/VehicleRequestMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.database.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.database.domain.VehicleRequest; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description VehicleRequestMapper + * @Author lijingtong + * @Date 2025-05-28 + */ +@Mapper +public interface VehicleRequestMapper extends BaseMapper { +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/VehicleRequestService.java b/gather-app/src/main/java/com/ruoyi/database/service/VehicleRequestService.java new file mode 100644 index 0000000..156898a --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/service/VehicleRequestService.java @@ -0,0 +1,12 @@ +package com.ruoyi.database.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.database.domain.VehicleRequest; + +/** + * @Description VehicleRequestService + * @Author lijingtong + * @Date 2025-05-28 + */ +public interface VehicleRequestService extends IService { +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/impl/VehicleRequestServiceImpl.java b/gather-app/src/main/java/com/ruoyi/database/service/impl/VehicleRequestServiceImpl.java new file mode 100644 index 0000000..04640ba --- /dev/null +++ b/gather-app/src/main/java/com/ruoyi/database/service/impl/VehicleRequestServiceImpl.java @@ -0,0 +1,16 @@ +package com.ruoyi.database.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.database.domain.VehicleRequest; +import com.ruoyi.database.mapper.VehicleRequestMapper; +import com.ruoyi.database.service.VehicleRequestService; +import org.springframework.stereotype.Service; + +/** + * @Description VehicleRequestServiceImpl + * @Author lijingtong + * @Date 2025-05-28 + */ +@Service +public class VehicleRequestServiceImpl extends ServiceImpl implements VehicleRequestService { +}