From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 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 44c0bc0..03411c3 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 javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils;
@@ -150,22 +151,22 @@
/**
* 缂栬緫
*
- * @param operationCertificatePage
+ * @param operationCertificate
* @return
*/
@AutoLog(value = "鎿嶄綔璇佷功绠＄悊-缂栬緫")
@ApiOperation(value="鎿嶄綔璇佷功绠＄悊-缂栬緫", notes="鎿嶄綔璇佷功绠＄悊-缂栬緫")
//@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_operation_certificate:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody OperationCertificatePage operationCertificatePage) {
- OperationCertificate operationCertificate = new OperationCertificate();
- BeanUtils.copyProperties(operationCertificatePage, operationCertificate);
+ public Result<String> edit(@RequestBody OperationCertificate operationCertificate) {
+// OperationCertificate operationCertificate = new OperationCertificate();
+// BeanUtils.copyProperties(operationCertificatePage, operationCertificate);
OperationCertificate operationCertificateEntity = operationCertificateService.getById(operationCertificate.getId());
if(operationCertificateEntity==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
- operationCertificateService.updateMain(operationCertificate, operationCertificatePage.getOperationCertificateDetailList());
- return Result.OK("缂栬緫鎴愬姛!");
+ operationCertificateService.updateMain(operationCertificate, operationCertificate.getOperationCertificateDetailList());
+ return Result.OK("鎿嶄綔璇佹墸鍒嗘垚鍔�!");
}
/**
@@ -297,7 +298,47 @@
for (int i = 0; i < list.size(); i++) {
OperationCertificateImportVo operationCertificateImportVo = list.get(i);
OperationCertificate operationCertificate = new OperationCertificate();
- operationCertificate.setNum(identityService.getNumByTypeAndLength("OperationCertificate",4));
+ //鍒ょ┖
+ if(StringUtils.isBlank(operationCertificateImportVo.getName())){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:浜哄憳涓嶈兘涓虹┖锛�");
+ errorLines++;
+ continue;
+ }
+ if(StringUtils.isBlank(operationCertificateImportVo.getTechnicalLevel())){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:鎶�鑳界瓑绾т笉鑳戒负绌猴紒");
+ errorLines++;
+ continue;
+ }
+ if(StringUtils.isBlank(operationCertificateImportVo.getProfession())){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:宸ョ涓嶈兘涓虹┖锛�");
+ errorLines++;
+ continue;
+ }
+ if(StringUtils.isBlank(operationCertificateImportVo.getWorkNo())){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:宸ヤ綔璇佸彿涓嶈兘涓虹┖锛�");
+ errorLines++;
+ continue;
+ }
+ if(StringUtils.isBlank(operationCertificateImportVo.getAppointmentCardNum())){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:涓婂矖璇佸彿涓嶈兘涓虹┖锛�");
+ errorLines++;
+ continue;
+ }
+ if(StringUtils.isBlank(operationCertificateImportVo.getEquipmentNum())){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栧彿涓嶈兘涓虹┖锛�");
+ errorLines++;
+ continue;
+ }
+ if(operationCertificateImportVo.getIssueDate() == null){
+ errorMessage.add("绗�" + (i + 1) + "琛屽鍏ュけ璐�,鍘熷洜:鍙戣瘉鏃ユ湡涓嶈兘涓虹┖锛�");
+ errorLines++;
+ continue;
+ }
+ if(StringUtils.isBlank(operationCertificateImportVo.getNum())){
+ operationCertificate.setNum(identityService.getNumByTypeAndLength("OperationCertificate",4));
+ }else {
+ operationCertificate.setNum(operationCertificateImportVo.getNum());
+ }
//鏍规嵁浜哄憳濮撳悕鏌ヨ浜哄憳id
List<SysUser> userList = userService.lambdaQuery().eq(SysUser::getRealname,operationCertificateImportVo.getName().trim())
.eq(SysUser::getWorkNo,operationCertificateImportVo.getWorkNo().trim()).eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0).list();
@@ -384,7 +425,8 @@
} catch (Exception e) {
errorMessage.add("鍙戠敓寮傚父锛�" + e.getMessage());
log.error(e.getMessage(), e);
- return (Result<?>) errorMessage;
+ return Result.error(errorMessage.toString());
+ // return (Result<?>) errorMessage;
} finally {
try {
file.getInputStream().close();
--
Gitblit v1.9.3