From 133e9fccff97927467a2edbfec8ae1f382722fae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 27 一月 2024 16:31:38 +0800
Subject: [PATCH] # 打印物料码 文本自动换行
---
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index be530f5..250c640 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.AdjDetl;
import com.zy.asrs.service.AdjDetlService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.SaasLog;
+import com.zy.system.service.SaasLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,9 @@
@Autowired
private AdjDetlService adjDetlService;
+ @Autowired
+ private SaasLogService saasLogService;
+
@RequestMapping(value = "/adjDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -39,22 +44,27 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
+ //浠ュ墠鏄珛搴撳簱瀛樿皟鏁存帴鍙ｏ紝鍚庢敼涓哄钩搴撹皟鏁存帴鍙�
excludeTrash(param);
- EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
+ EntityWrapper<SaasLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ wrapper.eq("type",2);
+ allLike(SaasLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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())));
+ 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);
}
}
}
--
Gitblit v1.9.1