From d0ad3d6b86aab1c7452cb98260245ddcd2c4bee8 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 11 Jul 2024 16:51:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=85=A5=E5=8C=BA=E5=88=92?=
 =?UTF-8?q?=E8=BD=AC=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/filemanager/TdFileProvideController.java   | 11 +++++++++++
 .../java/com/ruoyi/system/domain/TdFileProvide.java   | 11 +++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
index 1ad5f04..999127a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system.filemanager;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.sql.SqlUtil;
@@ -13,6 +14,7 @@ import com.ruoyi.system.domain.TdFileReceive;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ITdFileReceiveService;
+import com.ruoyi.web.controller.manager.SysAreaManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -31,6 +33,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import javax.annotation.Resource;
+
 /**
  * 文件下发Controller
  * 
@@ -70,6 +74,9 @@ public class TdFileProvideController extends BaseController
         return getDataTable(list);
     }
 
+
+    @Resource
+    private SysAreaManager sysAreaManager;
     /**
      * 导出文件下发列表
      */
@@ -80,6 +87,10 @@ public class TdFileProvideController extends BaseController
     public AjaxResult export(TdFileProvide tdFileProvide)
     {
         List<TdFileProvide> list = tdFileProvideService.selectTdFileProvideList(tdFileProvide);
+        list.forEach(tdFileProvide1 -> {
+            tdFileProvide1.setFrameworkId(sysAreaManager.getAreaName(tdFileProvide1.getFrameworkId()));
+            tdFileProvide1.setAreaid(sysAreaManager.getAreaName(tdFileProvide1.getAreaid()));
+        });
         ExcelUtil<TdFileProvide> util = new ExcelUtil<TdFileProvide>(TdFileProvide.class);
         return util.exportExcel(list, "文件下发数据");
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileProvide.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileProvide.java
index bbcb01c..6978d20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileProvide.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileProvide.java
@@ -76,9 +76,14 @@ public class TdFileProvide extends BaseEntity
     private Date updateDate;
 
     /** 所属地区 */
-    @Excel(name = "所属地区")
+    @Excel(name = "所属市州")
     private String frameworkId;
 
+
+    /** 所属地区 */
+    @Excel(name = "所属区县")
+    private String areaid;
+
     /** 文件密级 */
     @Excel(name = "文件密级",readConverterExp = "0=秘密,1=机密,2=绝密")
     private String fileSecret;
@@ -104,9 +109,7 @@ public class TdFileProvide extends BaseEntity
     /**  */
     private String operateId;
 
-    /** 所属地区 */
-    @Excel(name = "所属地区")
-    private String areaid;
+
 
     public void setFileId(String fileId)
     {