From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index b9427e9..6c9ff33 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -14,9 +14,12 @@
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.service.QlyInspectService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -80,7 +83,6 @@
return qlyInspectService.saveSelected(param, loginUserId);
}
-
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/list")
public R list(@RequestBody Map<String, Object> map) {
@@ -104,10 +106,8 @@
@PostMapping("/qlyInspect/save")
public R save(@RequestBody QlyInspect qlyInspect) {
qlyInspect.setCreateBy(getLoginUserId());
- qlyInspect.setCreateTime(new Date());
qlyInspect.setUpdateBy(getLoginUserId());
- qlyInspect.setUpdateTime(new Date());
- if (!qlyInspectService.save(qlyInspect)) {
+ if (!qlyInspectService.qlySave(qlyInspect)) {
return R.error("Save Fail");
}
return R.ok("Save Success").add(qlyInspect);
@@ -129,6 +129,13 @@
@OperationLog("Delete 璐ㄦ淇℃伅")
@PostMapping("/qlyInspect/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ if (Objects.isNull(ids) || ids.length < 1) {
+ return R.error("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>().in(QlyInspect::getId, ids));
+ if (!qlyInspects.isEmpty()) {
+ return R.error("鏈夋槑缁嗗垪琛ㄥ瓨鍦紒锛�");
+ }
if (!qlyInspectService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
--
Gitblit v1.9.1