From ebeecf61232967a9c21ca4aa63ccec8e269b8c0e Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 29 九月 2025 09:13:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
index 132c6f0..a300c4f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.domain.Archiverecordstouser;
+import com.ruoyi.domain.vo.RecordToUserCount;
import com.ruoyi.service.IArchiverecordstouserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +34,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭。妗堝垎閰嶃�慍ontroller
*
* @author ruoyi
* @date 2025-07-20
@@ -65,7 +66,7 @@
return toAjax(200);
}
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭。妗堝垎閰嶃�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:list')")
@GetMapping("/list")
@@ -77,21 +78,41 @@
}
+
+ @PreAuthorize("@ss.hasPermi('system:archiverecordstouser:list')")
+ @GetMapping("/listArToUser")
+ public AjaxResult listAllUserRecord(String userName )
+ {
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ System.out.println(userName);
+ return archiverecordstouserService.countStatistic(userName,pageNum, pageSize);
+
+ }
+ @PreAuthorize("@ss.hasPermi('system:archiverecordstouser:list')")
+ @PostMapping("/exportArToUser")
+ public void exportArToUser(HttpServletResponse response)
+ {
+ // archiverecordstouserService.countStatistic()
+ List<RecordToUserCount> list = archiverecordstouserService.findAllRecordToUserCont();
+ ExcelUtil<RecordToUserCount> util = new ExcelUtil<RecordToUserCount>(RecordToUserCount.class);
+ util.exportExcel(response, list, "瀵煎嚭缁熻淇℃伅");
+ }
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭。妗堝垎閰嶃�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Archiverecordstouser archiverecordstouser)
{
List<Archiverecordstouser> list = archiverecordstouserService.selectArchiverecordstouserList(archiverecordstouser);
ExcelUtil<Archiverecordstouser> util = new ExcelUtil<Archiverecordstouser>(Archiverecordstouser.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭。妗堝垎閰嶃�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭。妗堝垎閰嶃�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:query')")
@GetMapping(value = "/{id}")
@@ -101,10 +122,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭。妗堝垎閰嶃��
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Archiverecordstouser archiverecordstouser)
{
@@ -112,10 +133,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭。妗堝垎閰嶃��
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Archiverecordstouser archiverecordstouser)
{
@@ -123,10 +144,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭。妗堝垎閰嶃��
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
--
Gitblit v1.9.1