From d6e6bfb133630b471fa0a9e70a49faa066d5a57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Thu, 5 Jun 2025 17:19:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B0=91=E8=AD=A6=E8=AF=B7=E5=81=87?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PoliceLeaveApprovalController.java | 8 ++++++-- .../ruoyi/database/domain/PoliceLeaveApproval.java | 13 ++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java index df9e9cf..4476efc 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @RequiredArgsConstructor -@Api(tags = "民警请（休）假审批表") +@Api(tags = "民警请假审批") @RequestMapping("/PoliceLeaveApproval") public class PoliceLeaveApprovalController extends BaseController { @@ -53,6 +53,10 @@ public class PoliceLeaveApprovalController extends BaseController { public AjaxResult add(@RequestBody PoliceLeaveApproval policeLeaveApproval){ SysUser user = getLoginUser().getUser(); if (policeLeaveApproval.getId() == null) { + policeLeaveApproval.setName(user.getNickName()); + policeLeaveApproval.setIdCard(user.getIdCard()); + policeLeaveApproval.setPhone(user.getPhonenumber()); + policeLeaveApproval.setDeptName(user.getDept().getDeptName()); policeLeaveApproval.setCreateBy(user.getNickName()); boolean result = policeLeaveApprovalService.save(policeLeaveApproval); if (!result) { @@ -79,7 +83,7 @@ public class PoliceLeaveApprovalController extends BaseController { return AjaxResult.success(result); } - @ApiOperation("查询流程") + @ApiOperation("查询流程详情") @GetMapping("/state/{id}") public AjaxResult state(@PathVariable Long id) { PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id); diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java index 95a85fa..4806601 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java @@ -35,7 +35,10 @@ public class PoliceLeaveApproval { @ApiModelProperty("所在单位") private String deptName; - @ApiModelProperty("请假事由（1-公休假 2-事假 3-探亲假 4-婚假 5-产假 6-护理假 7-病假 8-育儿假 9-其他）") + @ApiModelProperty("请假天数") + private String days; + + @ApiModelProperty("请假类别（1-公休假 2-事假 3-探亲假 4-婚假 5-产假 6-护理假 7-病假 8-育儿假 9-其他）") private Integer leaveType; @ApiModelProperty("请假开始时间") @@ -48,14 +51,6 @@ public class PoliceLeaveApproval { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime endDate; - @ApiModelProperty("所在单位意见") - private String deptOpinion; - - @ApiModelProperty("政治处意见") - private String politicalOpinion; - - @ApiModelProperty("局领导审批意见") - private String leaderApproval; @ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过") @TableField(condition = SqlCondition.EQUAL)