From f025dcb548278214d06f16fb88b50242afcca93a 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:00:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=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  | 55 ++++++++++++++++---
 .../ruoyi/database/domain/VehicleRequest.java |  6 ++
 2 files changed, 53 insertions(+), 8 deletions(-)

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 cf48626..4e68a81 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
@@ -1,15 +1,20 @@
 package com.ruoyi.business.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 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.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;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * @Description VehicleRequestController
@@ -24,22 +29,56 @@ import org.springframework.web.bind.annotation.RestController;
 public class VehicleRequestController extends BaseController {
     private final VehicleRequestService vehicleRequestService;
 
-    @ApiOperation("新增公务用车出县申请")
+    @ApiOperation("查询公务用车出县申请")
+    @GetMapping("/list")
+    public TableDataInfo list(VehicleRequest vehicleRequest) {
+        startPage();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        QueryWrapper<VehicleRequest> queryWrapper = new QueryWrapper<>(vehicleRequest);
+        String fTime = vehicleRequest.getFTime();
+        String eTime = vehicleRequest.getETime();
+//        把时间转成LocalDateTime格式
+        LocalDateTime fromTime = LocalDateTime.parse(fTime, formatter);
+        LocalDateTime endTime = LocalDateTime.parse(eTime, formatter);
+        queryWrapper.orderByDesc("create_time");
+        if (fTime != null && fTime != null) {
+            queryWrapper.between("create_time", fromTime, endTime);
+        }
+        List<VehicleRequest> list = vehicleRequestService.list();
+        long size = list.size();
+        return getDataTableEnhance(list, size);
+    }
+
+    @ApiOperation("新增或修改公务用车出县申请 传id为修改 不传id为新增")
     @RequestMapping("/add")
     public AjaxResult add(@RequestBody VehicleRequest vehicleRequest) {
-        if (vehicleRequest.getId()==null){
+        SysUser user = getLoginUser().getUser();
+        if (vehicleRequest.getId() == null) {
+            vehicleRequest.setCreateBy(user.getNickName());
+            vehicleRequest.setState(0);
             boolean result = vehicleRequestService.save(vehicleRequest);
-            if (!result){
+            if (!result) {
                 return AjaxResult.error("新增公务用车出县申请失败");
             }
             return AjaxResult.success(result);
-        }else {
+        } else {
+            vehicleRequest.setUpdateBy(user.getNickName());
             boolean result = vehicleRequestService.updateById(vehicleRequest);
-            if (!result){
+            if (!result) {
                 return AjaxResult.error("修改公务用车出县申请失败");
             }
             return AjaxResult.success(result);
         }
 
     }
+
+    @ApiOperation("删除公务用车出县申请")
+    @RequestMapping("/delete/{id}")
+    public AjaxResult delete(@PathVariable Long id) {
+        boolean result = vehicleRequestService.removeById(id);
+        if (!result) {
+            return AjaxResult.error("删除公务用车出县申请失败");
+        }
+        return AjaxResult.success("删除公务用车出县申请成功");
+    }
 }
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 7ab2818..e462ba0 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
@@ -2,6 +2,7 @@ package com.ruoyi.database.domain;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -115,4 +116,9 @@ public class VehicleRequest {
 
     @ApiModelProperty("修改人")
     private String updateBy;
+
+    @TableField(exist = false)
+    private String fTime;
+    @TableField(exist = false)
+    private String eTime;
 }