From dbbb114c25b2406b6d1fd52019d2f2228ffcacd0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十一月 2024 18:04:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
index c7c282c..9632c3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
@@ -1,10 +1,14 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatArchiveImport;
@@ -36,12 +40,20 @@
* 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�")
- //@PreAuthorize("@ss.hasPermi('smartor:import:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatArchiveImport patArchiveImport) {
- startPage();
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatArchiveImport patArchiveImport) {
+ PageUtils.startPageByPost(patArchiveImport.getPageNum(), patArchiveImport.getPageSize());
List<PatArchiveImport> list = patArchiveImportService.selectPatArchiveImportList(patArchiveImport);
- return getDataTable(list);
+ //鑾峰彇total
+ long total = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patArchiveImport.setPageNum(null);
+ patArchiveImport.setPageSize(null);
+ patArchiveImportService.selectPatArchiveImportList(patArchiveImport);
+ }
+ });
+ return getDataTable2(total, list);
}
/**
@@ -115,6 +127,8 @@
//@PreAuthorize("@ss.hasPermi('smartor:import:list')")
@PostMapping("/importPatInfo")
public TableDataInfo importPatInfo(MultipartFile file) {
- return getDataTable(patArchiveImportService.importPatInfo(file));
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ return getDataTable(patArchiveImportService.importPatInfo(file, user));
}
}
--
Gitblit v1.9.3