From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java |   67 +++++++++++++++++++++++++++++++--
 1 files changed, 63 insertions(+), 4 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..74771cf 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
@@ -1,6 +1,8 @@
 package com.vincent.rsf.server.manager.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
@@ -10,8 +12,8 @@
 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.QlyIsptItem;
 import com.vincent.rsf.server.manager.service.QlyIsptItemService;
 import com.vincent.rsf.server.system.controller.BaseController;
@@ -36,7 +38,64 @@
     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)));
+        QueryWrapper<QlyIsptItem> queryWrapper = pageParam.buildWrapper(true);
+        /**鎷兼帴鎵╁睍瀛楁*/
+        PageParam<QlyIsptItem, BaseParam> page = qlyIsptItemService.page(pageParam, queryWrapper);
+        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);
+    }
+
+    /**
+     * @author Ryan
+     * @date 2025/5/12
+     * @description: 鑾峰彇璐ㄦ淇℃伅淇敼
+     * @version 1.0
+     */
+    @PreAuthorize("hasAuthority('manager:qlyIsptItem:list')")
+    @PostMapping("/qlyIsptItem/ispts/page")
+    public R getQlyList(@RequestBody Map<String, Object> map) {
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<QlyIsptItem, BaseParam> pageParam = new PageParam<>(baseParam, QlyIsptItem.class);
+        QueryWrapper<QlyIsptItem> queryWrapper = pageParam.buildWrapper(true);
+        IPage<QlyIsptItem> page = qlyIsptItemService.pageByWrapper(pageParam, queryWrapper);
+        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')")
+    @PostMapping("/qlyIsptItem/ispt/result/page")
+    public R getIsptResultList(@RequestBody Map<String, Object> map) {
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<QlyIsptItem, BaseParam> pageParam = new PageParam<>(baseParam, QlyIsptItem.class);
+        QueryWrapper<QlyIsptItem> queryWrapper = pageParam.buildWrapper(true);
+        IPage<QlyIsptItem> page = qlyIsptItemService.pageByIsptResult(pageParam, queryWrapper);
+        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,13 +173,13 @@
     }
 
     @PreAuthorize("hasAuthority('manager:qlyIsptItem:update')")
-    @ApiOperation("鎵归噺淇敼")
+    @ApiOperation("蹇�熻川妫�")
     @PostMapping("/qlyIsptItem/batch/update")
     public R batchUpdate(@RequestBody IsptItemsParams params) {
         if (Objects.isNull(params)) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        if (qlyIsptItemService.batchUpdate(params)) {
+        if (qlyIsptItemService.batchUpdate(params, getLoginUserId())) {
             return R.ok("淇敼鎴愬姛锛侊紒");
         } else  {
             return R.error("淇敼澶辫触锛侊紒");

--
Gitblit v1.9.1