lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 民警请假审批

This commit is contained in:
李京通 2025-06-05 17:19:29 +08:00
parent 9f2ad514c7
commit d6e6bfb133
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ import java.util.List;
*/ */
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "民警请（休）假审批表") @Api(tags = "民警请假审批")
@RequestMapping("/PoliceLeaveApproval") @RequestMapping("/PoliceLeaveApproval")
public class PoliceLeaveApprovalController extends BaseController { public class PoliceLeaveApprovalController extends BaseController {
@ -53,6 +53,10 @@ public class PoliceLeaveApprovalController extends BaseController {
public AjaxResult add(@RequestBody PoliceLeaveApproval policeLeaveApproval){ public AjaxResult add(@RequestBody PoliceLeaveApproval policeLeaveApproval){
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
if (policeLeaveApproval.getId() == null) { 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()); policeLeaveApproval.setCreateBy(user.getNickName());
boolean result = policeLeaveApprovalService.save(policeLeaveApproval); boolean result = policeLeaveApprovalService.save(policeLeaveApproval);
if (!result) { if (!result) {
@ -79,7 +83,7 @@ public class PoliceLeaveApprovalController extends BaseController {
return AjaxResult.success(result); return AjaxResult.success(result);
} }
@ApiOperation("查询流程") @ApiOperation("查询流程详情")
@GetMapping("/state/{id}") @GetMapping("/state/{id}")
public AjaxResult state(@PathVariable Long id) { public AjaxResult state(@PathVariable Long id) {
PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id); PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id);

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

@ -35,7 +35,10 @@ public class PoliceLeaveApproval {
@ApiModelProperty("所在单位") @ApiModelProperty("所在单位")
private String deptName; 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; private Integer leaveType;
@ApiModelProperty("请假开始时间") @ApiModelProperty("请假开始时间")
@ -48,14 +51,6 @@ public class PoliceLeaveApproval {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDateTime endDate; private LocalDateTime endDate;
@ApiModelProperty("所在单位意见")
private String deptOpinion;
@ApiModelProperty("政治处意见")
private String politicalOpinion;
@ApiModelProperty("局领导审批意见")
private String leaderApproval;
@ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过") @ApiModelProperty("审批流程 0-未审批 1-部门审批通过 2-部门审批不通过 3-警务保障部门审批通过 4-警务保障部门审批不通过 5-局领导审批通过 6-局领导审批不通过")
@TableField(condition = SqlCondition.EQUAL) @TableField(condition = SqlCondition.EQUAL)