From 2c250bb7d2c0efd16e5f124648bc77f5fd93040a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 29 十月 2023 22:05:14 +0800
Subject: [PATCH] 增加下次三保时间 技术状态类型及单号
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 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 601d2a2..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
@@ -3,15 +3,17 @@
import java.io.UnsupportedEncodingException;
import java.io.IOException;
import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+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;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -57,6 +59,9 @@
private IOperationCertificateService operationCertificateService;
@Autowired
private IOperationCertificateDetailService operationCertificateDetailService;
+
+ @Autowired
+ private IdentityService identityService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -96,6 +101,30 @@
operationCertificateService.saveMain(operationCertificate, operationCertificatePage.getOperationCertificateDetailList());
return Result.OK("娣诲姞鎴愬姛锛�");
}
+
+ @PostMapping(value = "/addOperationCertificate")
+ public Result<String> addOperationCertificate(@RequestBody List<OperationCertificateApplyDetail> operationCertificateList) {
+ for(OperationCertificateApplyDetail operationCertificateApplyDetail : operationCertificateList){
+ 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(identityService.getNumByTypeAndLength("OperationCertificate", 4));
+ operationCertificate.setUserId(operationCertificateApplyDetail.getUserId());
+ operationCertificate.setEquipmentIds(operationCertificateApplyDetail.getEquipmentIds());
+ operationCertificate.setCurrentCycleScore(12);
+ operationCertificate.setIssueDate(new Date());
+ operationCertificate.setStartTime(new Date());
+ operationCertificate.setEndTime(currentDate);
+ operationCertificate.setStatus("1");
+ operationCertificateService.save(operationCertificate);
+ }
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
/**
* 缂栬緫
@@ -261,5 +290,20 @@
}
return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
}
-
+ /**
+ * 閫氳繃涓昏〃ID鏌ヨ
+ * @return
+ */
+ //@AutoLog(value = "鎿嶄綔璇佺鐞嗘槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @ApiOperation(value="鎿嶄綔璇佺鐞嗘槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鎿嶄綔璇佺鐞嗘槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @GetMapping(value = "/listOperationCertificateDetailByMainId")
+ public Result<IPage<OperationCertificateDetail>> listOperationCertificateDetailByMainId(OperationCertificateDetail operationCertificateDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<OperationCertificateDetail> queryWrapper = QueryGenerator.initQueryWrapper(operationCertificateDetail, req.getParameterMap());
+ Page<OperationCertificateDetail> page = new Page<OperationCertificateDetail>(pageNo, pageSize);
+ IPage<OperationCertificateDetail> pageList = operationCertificateDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3