feat: 民警请（休）假审批表

gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java

@@ -99,9 +99,9 @@ public class BusinessTripApprovalController extends BaseController {
         businessTripApproval.setState(state);
         boolean result = businessTripApprovalService.updateById(businessTripApproval);
         if (!result) {
-            return AjaxResult.error("审批公务用车出县申请失败");
+            return AjaxResult.error("审批出差失败");
         }
-        return AjaxResult.success("审批公务用车出县申请成功");
+        return AjaxResult.success("审批出差成功");
     }
 
 

gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java

@@ -97,8 +97,8 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
         nonWorkingDayDrinkingReport.setState(state);
         boolean result = nonWorkingDayDrinkingReportService.updateById(nonWorkingDayDrinkingReport);
         if (!result) {
-            return AjaxResult.error("审批公务用车出县申请失败");
+            return AjaxResult.error("审批非工作日饮酒报备单失败");
         }
-        return AjaxResult.success("审批公务用车出县申请成功");
+        return AjaxResult.success("审批非工作日饮酒报备单成功");
     }
 }

gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java

@@ -0,0 +1,105 @@
+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.PoliceLeaveApproval;
+import com.ruoyi.database.domain.dto.ApprovaltDto;
+import com.ruoyi.database.service.PoliceLeaveApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * @Description PoliceLeaveApprovalController
+ * @Author lijingtong
+ * @Date 2025-05-29
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "民警请（休）假审批表")
+@RequestMapping("/PoliceLeaveApproval")
+public class PoliceLeaveApprovalController extends BaseController {
+
+    private final PoliceLeaveApprovalService policeLeaveApprovalService;
+
+    @RequestMapping("/list")
+    @ApiOperation("查询")
+    public TableDataInfo list(PoliceLeaveApproval policeLeaveApproval) {
+        startPage();
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String fTime = policeLeaveApproval.getFTime();
+        String eTime = policeLeaveApproval.getETime();
+        LocalDateTime time = LocalDateTime.parse(fTime, dtf);
+        LocalDateTime time1 = LocalDateTime.parse(eTime, dtf);
+        QueryWrapper<PoliceLeaveApproval> queryWrapper = new QueryWrapper<>(policeLeaveApproval);
+        queryWrapper.orderByDesc("create_time");
+        if  (fTime != null && fTime != null) {
+            queryWrapper.between("create_time", time, time1);
+        }
+        List<PoliceLeaveApproval> list = policeLeaveApprovalService.list(new QueryWrapper<>(policeLeaveApproval));
+        long size = list.size();
+        return getDataTableEnhance(list,size);
+    }
+    @ApiOperation("新增或修改民警请（休）假审批表 传id为修改 不传id为新增")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody PoliceLeaveApproval policeLeaveApproval){
+        SysUser user = getLoginUser().getUser();
+        if (policeLeaveApproval.getId() == null) {
+            policeLeaveApproval.setCreateBy(user.getNickName());
+            boolean result = policeLeaveApprovalService.save(policeLeaveApproval);
+            if (!result) {
+                return AjaxResult.error("新增民警请（休）假审批表失败");
+            }
+            return AjaxResult.success(result);
+        }else {
+            policeLeaveApproval.setUpdateBy(user.getNickName());
+            boolean result = policeLeaveApprovalService.updateById(policeLeaveApproval);
+            if (!result) {
+                return AjaxResult.error("修改民警请（休）假审批表失败");
+            }
+            return AjaxResult.success(result);
+        }
+    }
+
+    @ApiOperation("删除民警请（休）假审批表")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable Long id) {
+        boolean result = policeLeaveApprovalService.removeById(id);
+        if (!result) {
+            return AjaxResult.error("删除民警请（休）假审批表失败");
+        }
+        return AjaxResult.success(result);
+    }
+
+    @ApiOperation("查询流程")
+    @GetMapping("/state/{id}")
+    public AjaxResult state(@PathVariable Long id) {
+        PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id);
+        if (policeLeaveApproval == null) {
+            return AjaxResult.error("查询approval流程失败");
+        }
+        return AjaxResult.success(policeLeaveApproval);
+    }
+
+    @ApiOperation("审批")
+    @PostMapping("/approval")
+    public AjaxResult approval(@RequestBody ApprovaltDto dto) {
+        Long id = dto.getId();
+        Integer state = dto.getState();
+        PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id);
+        policeLeaveApproval.setState(state);
+        boolean result = policeLeaveApprovalService.updateById(policeLeaveApproval);
+        if (!result) {
+            return AjaxResult.error("审批请（休）假失败");
+        }
+        return AjaxResult.success("审批请（休）假成功");
+    }
+}

gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java

@@ -1,9 +1,6 @@
 package com.ruoyi.database.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -60,6 +57,10 @@ public class PoliceLeaveApproval {
     @ApiModelProperty("局领导审批意见")
     private String leaderApproval;
 
+    @ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过")
+    @TableField(condition = SqlCondition.EQUAL)
+    private Integer state;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

gather-app/src/main/java/com/ruoyi/database/mapper/PoliceLeaveApprovalMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.database.domain.PoliceLeaveApproval;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Description PoliceLeaveApprovalMapper
+ * @Author lijingtong
+ * @Date 2025-05-29
+ */
+@Mapper
+public interface PoliceLeaveApprovalMapper extends BaseMapper<PoliceLeaveApproval> {
+}

gather-app/src/main/java/com/ruoyi/database/service/PoliceLeaveApprovalService.java

@@ -0,0 +1,12 @@
+package com.ruoyi.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.database.domain.PoliceLeaveApproval;
+
+/**
+ * @Description PoliceLeaveApprovalService
+ * @Author lijingtong
+ * @Date 2025-05-29
+ */
+public interface PoliceLeaveApprovalService extends IService<PoliceLeaveApproval> {
+}

gather-app/src/main/java/com/ruoyi/database/service/impl/PoliceLeaveApprovalServiceImpl.java

@@ -0,0 +1,16 @@
+package com.ruoyi.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.database.domain.PoliceLeaveApproval;
+import com.ruoyi.database.mapper.PoliceLeaveApprovalMapper;
+import com.ruoyi.database.service.PoliceLeaveApprovalService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description PoliceLeaveApprovalServiceImpl
+ * @Author lijingtong
+ * @Date 2025-05-29
+ */
+@Service
+public class PoliceLeaveApprovalServiceImpl extends ServiceImpl<PoliceLeaveApprovalMapper, PoliceLeaveApproval> implements PoliceLeaveApprovalService {
+}