From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 725363a..f74f4f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -13,7 +13,7 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
-import com.smartor.service.IPatArchiveService;
+import com.ruoyi.patarchive.service.IPatArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -31,6 +31,11 @@
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.patarchive.domain.PatArchiveOthreInfo;
+import com.ruoyi.patarchive.domain.PatArchiveReq;
+import com.ruoyi.patarchive.domain.PatArchiveVO;
+import com.ruoyi.patarchive.domain.PatUpInfoVO;
/**
* 鎮ｈ�呮。妗圕ontroller
@@ -53,10 +58,14 @@
//@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("list")
- public TableDataInfo list(@RequestBody PatArchive patArchive) {
- PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+ public Map<String, Object> list(@RequestBody PatArchive patArchive) {
+ patArchive.setPageNum(PageUtils.getOffset(patArchive.getPageNum(), patArchive.getPageSize()));
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
- return getDataTable(list);
+ patArchive.setPageNum(null);
+ patArchive.setPageSize(null);
+ List<PatArchive> patArchives = patArchiveService.selectPatArchiveList(patArchive);
+
+ return getDataTable3(patArchives.size(), list);
}
/**
--
Gitblit v1.9.3