From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 1c875d1..95d8391 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
@@ -99,7 +99,7 @@
}
@Override
- public IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
+ public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
/**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
List<Map<String, Object>> mapList = reulst.getRecords();
@@ -110,17 +110,30 @@
}
});
}
- 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;
+
+ 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 page;
+ }
+
+ @Override
+ public Matnr selectMatnrById(Long id) {
+ Matnr matnr = this.baseMapper.selectById(id);
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("褰撳墠鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ if (!Objects.isNull(matnr.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex());
+ matnr.setExtendFields(fields);
+ }
+ return matnr;
}
/**
@@ -134,8 +147,6 @@
Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
if (Objects.isNull(matnr1.getCode())) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
- System.out.println("=========>");
- System.out.println(ruleCode);
matnr1.setCode(ruleCode);
}
/**
@@ -146,9 +157,9 @@
FieldsUtils.saveFields(matnr, uuid16);
matnr1.setFieldsIndex(uuid16);
}
- if (!this.save(matnr1)) {
+ if (!this.saveOrUpdate(matnr1)) {
return R.error("Save Fail");
}
- return R.ok("淇濆瓨鎴愬姛!!");
+ return R.ok(matnr1);
}
}
--
Gitblit v1.9.1