From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
index 6f3dd5d..a7628da 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
@@ -12,6 +12,7 @@
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.OperationCertificateApplyDetail;
+import org.jeecg.modules.eam.service.IdentityService;
import org.jeecg.modules.system.service.SysIdentityService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -60,7 +61,7 @@
private IOperationCertificateDetailService operationCertificateDetailService;
@Autowired
- private SysIdentityService sysIdentityService;
+ private IdentityService identityService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -104,14 +105,14 @@
@PostMapping(value = "/addOperationCertificate")
public Result<String> addOperationCertificate(@RequestBody List<OperationCertificateApplyDetail> operationCertificateList) {
for(OperationCertificateApplyDetail operationCertificateApplyDetail : operationCertificateList){
- if("Y".equals(operationCertificateApplyDetail.getExaminationConclusion())){
+ if("pass".equals(operationCertificateApplyDetail.getExaminationConclusion())){
Date currentDate = new Date();
Calendar c = Calendar.getInstance();
c.setTime(currentDate);
c.add(Calendar.YEAR, 1);
currentDate = c.getTime();
OperationCertificate operationCertificate = new OperationCertificate();
- operationCertificate.setNum(sysIdentityService.getNumByTypeAndLength("OperationCertificate", 4));
+ operationCertificate.setNum(identityService.getNumByTypeAndLength("OperationCertificate", 4));
operationCertificate.setUserId(operationCertificateApplyDetail.getUserId());
operationCertificate.setEquipmentIds(operationCertificateApplyDetail.getEquipmentIds());
operationCertificate.setCurrentCycleScore(12);
--
Gitblit v1.9.3