From 5b79201484ea59ae2dfc2590b645ccac48a81947 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 13:36:26 +0800
Subject: [PATCH] 组托历史档数据优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 33d6939..59971b5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -63,7 +64,11 @@
public R areaNoUselist(@RequestBody Map<String, Object> map) {
String locCode = map.get("locCode").toString();
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
- List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, loc.getAreaId()));
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getAreaId, loc.getAreaId())
+ .eq(Loc::getChannel,loc.getChannel())
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ );
List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
return R.ok(list1);
}
@@ -160,7 +165,7 @@
if (Objects.isNull(map.get("ids"))) {
locs = locService.list();
} else {
- locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getId , map.get("ids")).eq(Loc::getStatus, 1));
+ locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getStatus, 1));
}
ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
}
@@ -222,6 +227,10 @@
if (Objects.isNull(param.getEndLev())) {
return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
}
+ if (Objects.isNull(param.getChannel())) {
+ return R.error("宸烽亾涓嶈兘涓虹┖锛侊紒");
+ }
+
return locService.initLocs(param, getLoginUserId());
}
--
Gitblit v1.9.1