feat:无处罚证明开具

yun-admin/src/main/java/net/lab1024/sa/admin/module/penalty/controller/PenaltyApplyController.java

@@ -69,4 +69,12 @@ public class PenaltyApplyController {
     public ResponseDTO<String> batchDelete(@PathVariable Long id) {
         return penaltyApplyService.delete(id);
     }
+
+    //审核
+    @Operation(summary = "审核 @author wzh")
+    @PostMapping("/penaltyApply/review")
+    @SaCheckPermission("penaltyApply:review")
+    public ResponseDTO<String> review(@RequestBody @Valid PenaltyApplyUpdateForm updateForm) {
+        return penaltyApplyService.review(updateForm);
+    }
 }

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;
-
-
 }

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;
 }

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;
+
 }

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;
 

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<String> review(@Valid PenaltyApplyUpdateForm updateForm) {
+        PenaltyApplyEntity penaltyApplyEntity = penaltyApplyDao.selectById(updateForm.getId());
+        penaltyApplyEntity.setStatus(updateForm.getStatus());
+        penaltyApplyDao.updateById(penaltyApplyEntity);
+        return ResponseDTO.ok();
+    }
 }

yun-admin/src/main/resources/mapper/penaltyapply/PenaltyApplyMapper.xml

@@ -17,9 +17,33 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultType="net.lab1024.sa.admin.module.penalty.domain.vo.PenaltyApplyVO">
         SELECT
-        <include refid="base_columns"/>
+        tp_apply.id,
-        FROM t_penalty_apply
+        tp_apply.user_id as userId,
-
+        tp_apply.apply_date as applyDate,
+        tp_apply.use_purpose as usePurpose,
+        tp_apply.status as status,
+        tp_apply.create_time as createTime,
+        tp_apply.update_time as updateTime,
+        tp_apply.deleted_flag as deletedFlag,
+        te_employee.actual_name AS userName
+        FROM t_penalty_apply tp_apply left join t_employee te_employee on tp_apply.user_id = te_employee.employee_id
+        <where>
+            tp_apply.deleted_flag = 0
+            <if test="queryForm != null">
+                <if test="queryForm.userName != null and queryForm.userName != ''">
+                    AND te_employee.actual_name like concat('%',#{queryForm.userName},'%')
+                </if>
+                <if test="queryForm.status != null and queryForm.status != ''">
+                    AND tp_apply.status = #{queryForm.status}
+                </if>
+                <if test="queryForm.applyDateStart != null">
+                    AND tp_apply.apply_date &gt;= #{queryForm.applyDateStart}
+                </if>
+                <if test="queryForm.applyDateEnd != null">
+                    AND tp_apply.apply_date &lt;= #{queryForm.applyDateEnd}
+                </if>
+            </if>
+        </where>
     </select>
 
     <update id="batchUpdateDeleted">