From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/BasWhsController.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index 4e0388e..494c341 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasWhs;
-import com.zy.asrs.service.BasWhsService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWhs;
+import com.zy.asrs.service.BasWhsService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,26 +32,29 @@
@RequestMapping(value = "/basWhs/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWhsService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -67,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWhs/update/auth")
+ @RequestMapping(value = "/basWhs/update/auth")
@ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
- public R update(BasWhs basWhs){
- if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
+ public R update(BasWhs basWhs) {
+ if (Cools.isEmpty(basWhs) || null == basWhs.getId()) {
return R.error();
}
basWhs.setModiUser(getUserId());
@@ -81,12 +84,12 @@
@RequestMapping(value = "/basWhs/delete/auth")
@ManagerAuth(memo = "搴撲綅绫诲瀷鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWhs entity : list){
+ for (BasWhs entity : list) {
basWhsService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -94,7 +97,7 @@
@RequestMapping(value = "/basWhs/export/auth")
@ManagerAuth(memo = "搴撲綅绫诲瀷瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs"));
@@ -110,9 +113,9 @@
wrapper.like("whs_desc", condition);
Page<BasWhs> page = basWhsService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWhs basWhs : page.getRecords()){
+ for (BasWhs basWhs : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
- map.put("id", basWhs.getId());
+ map.put("id", basWhs.getIdentifying());
map.put("value", basWhs.getWhsDesc());
result.add(map);
}
@@ -123,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWhsService.selectOne(wrapper)){
+ if (null != basWhsService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1