From 36848f23ba7f635ef9477866d783eb319dd3a3f9 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 01 四月 2025 15:34:34 +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 | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 5bd9c60..bf03f2b 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
@@ -59,23 +59,26 @@
return R.ok(qlyInspectService.listByAsn(map));
}
- @GetMapping("/qlyInspect/asn/list")
+ @PostMapping("/qlyInspect/asn/list")
@ApiOperation("鑾峰彇寰呰川妫�鍗�")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
- public R getUnInspect() {
- return R.ok(qlyInspectService.getUnInspect());
+ public R getUnInspect(@RequestBody Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(qlyInspectService.getUnInspect(map));
}
@PostMapping("/qlyInspect/selected")
@ApiOperation("閫夋嫨璐ㄦ鍗曟嵁")
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
- public R selectedOrder(IsptOrderParam param) {
+ public R selectedOrder(@RequestBody IsptOrderParam param) {
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return qlyInspectService.saveSelected(param);
+ Long loginUserId = getLoginUserId();
+ return qlyInspectService.saveSelected(param, loginUserId);
}
-
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/list")
@@ -100,9 +103,7 @@
@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)) {
return R.error("Save Fail");
}
--
Gitblit v1.9.1