From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 11 五月 2025 15:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
index 0c8d681..9c71c5c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
@@ -10,8 +10,10 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -36,7 +38,19 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<QlyIsptItem, BaseParam> pageParam = new PageParam<>(baseParam, QlyIsptItem.class);
- return R.ok().add(qlyIsptItemService.page(pageParam, pageParam.buildWrapper(true)));
+
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<QlyIsptItem, BaseParam> page = qlyIsptItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<QlyIsptItem> records = page.getRecords();
+ for (QlyIsptItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+
+ return R.ok(page);
}
@PreAuthorize("hasAuthority('manager:qlyIsptItem:list')")
@@ -114,7 +128,7 @@
}
@PreAuthorize("hasAuthority('manager:qlyIsptItem:update')")
- @ApiOperation("鎵归噺淇敼")
+ @ApiOperation("蹇�熻川妫�")
@PostMapping("/qlyIsptItem/batch/update")
public R batchUpdate(@RequestBody IsptItemsParams params) {
if (Objects.isNull(params)) {
--
Gitblit v1.9.1