From 04f60926839a382bc1dca5dd50d079cf1a6498cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwangzihua=E2=80=9D?= Date: Wed, 7 Jan 2026 23:01:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=97=A0=E5=A4=84=E7=BD=9A=E8=AF=81?= =?UTF-8?q?=E6=98=8E=E5=BC=80=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PenaltyApplyController.java | 8 +++++ .../domain/form/PenaltyApplyAddForm.java | 2 -- .../domain/form/PenaltyApplyQueryForm.java | 17 +++++++++++ .../domain/form/PenaltyApplyUpdateForm.java | 3 ++ .../penalty/domain/vo/PenaltyApplyVO.java | 3 ++ .../penalty/service/PenaltyApplyService.java | 13 +++++++- .../penaltyapply/PenaltyApplyMapper.xml | 30 +++++++++++++++++-- 7 files changed, 70 insertions(+), 6 deletions(-) diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/controller/PenaltyApplyController.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/controller/PenaltyApplyController.java index 1f855e9..fe73554 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/controller/PenaltyApplyController.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/controller/PenaltyApplyController.java @@ -69,4 +69,12 @@ public class PenaltyApplyController { public ResponseDTO batchDelete(@PathVariable Long id) { return penaltyApplyService.delete(id); } + + //审核 + @Operation(summary = "审核 @author wzh") + @PostMapping("/penaltyApply/review") + @SaCheckPermission("penaltyApply:review") + public ResponseDTO review(@RequestBody @Valid PenaltyApplyUpdateForm updateForm) { + return penaltyApplyService.review(updateForm); + } } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyAddForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyAddForm.java index 81771e9..ffdcb07 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyAddForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyAddForm.java @@ -20,6 +20,4 @@ public class PenaltyApplyAddForm { @Schema(description = "申请人用途", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "申请人用途 不能为空") private String usePurpose; - - } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyQueryForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyQueryForm.java index a814314..317d857 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyQueryForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyQueryForm.java @@ -4,6 +4,9 @@ import net.lab1024.sa.base.common.domain.PageParam; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 无处罚证明申请主表 分页查询表单 * @@ -15,5 +18,19 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) public class PenaltyApplyQueryForm extends PageParam { + /** + * 申请日期 + */ + private LocalDateTime applyDateEnd; + + private LocalDateTime applyDateStart; + /** + * 申请人 + */ + private String userName; + /** + * 状态（0-未提交，1-已提交，2-审核中，3-已批准，5-已驳回） + */ + private Integer status; } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyUpdateForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyUpdateForm.java index 530c45d..7686ce0 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyUpdateForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/form/PenaltyApplyUpdateForm.java @@ -19,4 +19,7 @@ public class PenaltyApplyUpdateForm { @NotNull(message = "申请ID 不能为空") private Long id; + @Schema(description = "状态（0-未提交，1-已提交，2-审核中，3-已批准，5-已驳回）") + private Integer status; + } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/vo/PenaltyApplyVO.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/vo/PenaltyApplyVO.java index af6a850..ec0b1d0 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/vo/PenaltyApplyVO.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/domain/vo/PenaltyApplyVO.java @@ -23,6 +23,9 @@ public class PenaltyApplyVO { @Schema(description = "申请人ID") private Long userId; + @Schema(description = "申请人名称") + private String userName; + @Schema(description = "申请日期") private LocalDate applyDate; diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/service/PenaltyApplyService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/service/PenaltyApplyService.java index 3bbe06e..77f6982 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/service/PenaltyApplyService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/service/PenaltyApplyService.java @@ -10,6 +10,8 @@ import net.lab1024.sa.admin.module.penalty.domain.form.PenaltyApplyAddForm; import net.lab1024.sa.admin.module.penalty.domain.form.PenaltyApplyQueryForm; import net.lab1024.sa.admin.module.penalty.domain.form.PenaltyApplyUpdateForm; import net.lab1024.sa.admin.module.penalty.domain.vo.PenaltyApplyVO; +import net.lab1024.sa.admin.module.system.department.service.DepartmentService; +import net.lab1024.sa.admin.module.system.employee.service.EmployeeService; import net.lab1024.sa.admin.util.AdminRequestUtil; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartPageUtil; @@ -20,6 +22,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.validation.Valid; /** * 无处罚证明申请主表 Service @@ -34,7 +37,8 @@ public class PenaltyApplyService { @Resource private PenaltyApplyDao penaltyApplyDao; - + @Resource + private EmployeeService employeeService; /** * 分页查询 */ @@ -90,4 +94,11 @@ public class PenaltyApplyService { penaltyApplyDao.updateDeleted(id, true); return ResponseDTO.ok(); } + + public ResponseDTO review(@Valid PenaltyApplyUpdateForm updateForm) { + PenaltyApplyEntity penaltyApplyEntity = penaltyApplyDao.selectById(updateForm.getId()); + penaltyApplyEntity.setStatus(updateForm.getStatus()); + penaltyApplyDao.updateById(penaltyApplyEntity); + return ResponseDTO.ok(); + } } diff --git a/yun-admin/src/main/resources/mapper/penaltyapply/PenaltyApplyMapper.xml b/yun-admin/src/main/resources/mapper/penaltyapply/PenaltyApplyMapper.xml index 5cd9b2a..51e291a 100644 --- a/yun-admin/src/main/resources/mapper/penaltyapply/PenaltyApplyMapper.xml +++ b/yun-admin/src/main/resources/mapper/penaltyapply/PenaltyApplyMapper.xml @@ -17,9 +17,33 @@