From a67dab8161c7428aa7cbd6f9051dd5ae77af4ed8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 19:13:41 +0800
Subject: [PATCH] fix: 修复考勤异常并验证原材料销售审批
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java
index 3854488..b42bbb7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/certificate/HrmCertificateController.java
@@ -5,6 +5,10 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.certificate.vo.HrmCertificateImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.certificate.vo.HrmCertificateImportReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.certificate.vo.HrmCertificateImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.certificate.vo.HrmCertificatePageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.certificate.vo.HrmCertificateRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.certificate.vo.HrmCertificateSaveReqVO;
@@ -12,16 +16,20 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.service.certificate.HrmCertificateService;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
+import cn.iocoder.yudao.module.hrm.service.remind.HrmExpiryRemindService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.time.LocalDate;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -39,6 +47,8 @@
private HrmCertificateService certificateService;
@Resource
private HrmEmployeeService employeeService;
+ @Resource
+ private HrmExpiryRemindService expiryRemindService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璇佷功璧勮川")
@@ -67,7 +77,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璇佷功璧勮川")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('hrm:certificate:query')")
public CommonResult<HrmCertificateRespVO> getCertificate(@RequestParam("id") Long id) {
HrmCertificateDO certificate = certificateService.getCertificate(id);
return success(certificate != null ? buildRespVO(certificate) : null);
@@ -75,8 +84,12 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璇佷功璧勮川鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:certificate:query')")
public CommonResult<PageResult<HrmCertificateRespVO>> getCertificatePage(@Valid HrmCertificatePageReqVO pageReqVO) {
+ // 鎳掕Е鍙戯細鏈変汉鎵撳紑璇佷功鍒楄〃鏃堕『甯﹁ˉ鎵嵆灏嗗埌鏈熻瘉涔﹀苟鍙戦�佺珯鍐呬俊鎻愰啋锛坆est-effort锛�
+ try {
+ expiryRemindService.sendCertificateExpireRemind();
+ } catch (Exception ignored) {
+ }
PageResult<HrmCertificateDO> pageResult = certificateService.getCertificatePage(pageReqVO);
if (CollUtil.isEmpty(pageResult.getList())) {
return success(PageResult.empty(pageResult.getTotal()));
@@ -130,4 +143,26 @@
return 0;
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆璇佷功璧勮川妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<HrmCertificateImportExcelVO> list = Arrays.asList(
+ HrmCertificateImportExcelVO.builder().employeeName("寮犱笁").certType(1).certName("浣庡帇鐢靛伐浣滀笟璇�")
+ .certNo("T20260001").issueOrg("搴旀�ョ鐞嗗眬").issueDate(LocalDate.of(2026, 1, 1))
+ .expireDate(LocalDate.of(2029, 1, 1)).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "璇佷功璧勮川瀵煎叆妯℃澘.xls", "璇佷功璧勮川鍒楄〃", HrmCertificateImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆璇佷功璧勮川")
+ @PreAuthorize("@ss.hasPermission('hrm:certificate:import')")
+ public CommonResult<HrmCertificateImportRespVO> importExcel(@Valid HrmCertificateImportReqVO importReqVO)
+ throws Exception {
+ List<HrmCertificateImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmCertificateImportExcelVO.class);
+ return success(certificateService.importCertificateList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3