From 77488ce5ba10ca8a29d6a29a7c2a69ba62cdf2d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 14:50:00 +0800
Subject: [PATCH] 质检添加搜索条件
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 9 ++++++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 7 +++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java | 2 +-
3 files changed, 12 insertions(+), 6 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..aad1078 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,11 +59,14 @@
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")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
index 5535166..7dd9b48 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
@@ -17,7 +17,7 @@
R allSave(QlyInspectAndItem params);
- List<AsnOrder> getUnInspect();
+ List<AsnOrder> getUnInspect(Map<String, Object> map);
R saveSelected(IsptOrderParam param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
index 1348ba0..9697614 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
@@ -102,8 +102,11 @@
*/
@Override
- public List<AsnOrder> getUnInspect() {
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getStatus, 1).eq(AsnOrder::getNtyStatus, 0));
+ public List<AsnOrder> getUnInspect(Map<String, Object> params) {
+ List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
+ .eq(AsnOrder::getStatus, 1)
+ .eq(!Objects.isNull(params.get("asnCode")), AsnOrder::getCode, !Objects.isNull(params.get("asnCode")) ? params.get("asnCode").toString() : "")
+ .eq(AsnOrder::getNtyStatus, 0));
return asnOrders;
}
--
Gitblit v1.9.1