From 4235b508143509b4f8aa85c8b561313f131b1d4b Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 20 三月 2025 21:12:08 +0800
Subject: [PATCH] #修改 物料列表返回字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 30f9f74..a4e194d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -2,7 +2,11 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
@@ -96,16 +100,28 @@
}
@Override
- public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
- PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
- List<Matnr> records = page.getRecords();
- for (Matnr record : records) {
- if (!Objects.isNull(record.getFieldsIndex())) {
- Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
- record.setExtendFields(fields);
- }
+ public IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
+ IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
+
+ /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
+ List<Map<String, Object>> mapList = reulst.getRecords();
+ if (!mapList.isEmpty()) {
+ mapList.forEach(map -> {
+ if (!Objects.isNull(map.get("fieldsIndex"))) {
+ FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
+ }
+ });
}
- page.setRecords(records);
- return page;
+ List<Matnr> matnrs = JSONArray.parseArray(JSON.toJSONString(mapList), Matnr.class);
+// PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
+// List<Matnr> records = page.getRecords();
+// for (Matnr record : records) {
+// if (!Objects.isNull(record.getFieldsIndex())) {
+// Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+// record.setExtendFields(fields);
+// }
+// }
+// page.setRecords(records);
+ return reulst;
}
}
--
Gitblit v1.9.1