From 6d581fd0902cf23b7616b27cb55bf682f25329e0 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 11 Jul 2024 16:42:27 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E7=BB=A9?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/elExam/userExam/view.html | 20 ++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
index 30de060..48d19c3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html
@@ -27,7 +27,7 @@
</el-col>
<el-col :span="12">
- 考试状态：{{ item.state | paperStateFilter }}
+ 考试状态：{{ item.stateName}}
</el-col>
</el-row>
@@ -38,13 +38,27 @@
<th:block th:include="include :: footer" />
<th:block th:include="include :: element-js" />
<script th:inline="javascript">
+ var examStateDatas = [[${@dict.getType('sys_exam_state')}]];
var app = new Vue({
el: '#app',
data: {
- paperList: []
+ paperList: [[${list}]],
+ examStateList:examStateDatas
},
mounted(){
- this.paperList = [[${list}]];
+ this.paperList = this.updatedPaperList
+ },
+ computed: {
+ updatedPaperList() {
+ return this.paperList.map(paper => {
+ const match = this.examStateList.find(item => item.dictValue == paper.state);
+ if (match) {
+ return { ...paper, stateName: match.dictLabel };
+ } else {
+ return paper;
+ }
+ });
+ }
},
methods:{
formatDate(dateString) {
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 2/8] =?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)
{
From cb5c22b79f0b34276c1d8d64c09b4c2d194e6afd Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 11 Jul 2024 16:58:33 +0800
Subject: [PATCH 3/8] =?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
---
.../controller/system/system/TdTrainController.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
index e543ba0..c0044b4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdTrainController.java
@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysUser;
+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;
@@ -22,6 +23,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
*
@@ -37,6 +40,9 @@ public class TdTrainController extends BaseController
@Autowired
private ITdTrainService tdTrainService;
+ @Resource
+ private SysAreaManager sysAreaManager;
+
@RequiresPermissions("system:train:view")
@GetMapping()
public String train()
@@ -67,6 +73,10 @@ public class TdTrainController extends BaseController
public AjaxResult export(TdTrain tdTrain)
{
List<TdTrain> list = tdTrainService.selectTdTrainList(tdTrain);
+ list.forEach(tdTrain1 -> {
+ tdTrain1.setAREAID(sysAreaManager.getAreaName(tdTrain1.getAREAID()));
+ tdTrain1.setFRAMEWORK(sysAreaManager.getAreaName(tdTrain1.getFRAMEWORK()));
+ });
ExcelUtil<TdTrain> util = new ExcelUtil<TdTrain>(TdTrain.class);
return util.exportExcel(list, "涉密人员培训数据");
}
From 21f11260f25278fc85dba42d73c6b1ac3b2024fc Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 11 Jul 2024 17:10:56 +0800
Subject: [PATCH 4/8] =?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
---
.../src/main/resources/templates/system/elExam/qu/toImport.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html
index c53a567..1067597 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html
@@ -13,7 +13,7 @@
</el-row>
<el-row>
<div style="color: red;height: 30px;line-height: 30px;">
- 请选择后缀为 “xls”或“xlsx”的文件。
+ 提示：请下载导入模板（试题导入模板.xlsx），</br> 按照模板要求填写后导入。
</div>
</el-row>
<el-row>
From 9a417678187e617c55d4a2885f021d4bd362c378 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Fri, 12 Jul 2024 08:45:46 +0800
Subject: [PATCH 5/8] =?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/property/TdPropertyManagerController.java | 10 ++++++++++
.../com/ruoyi/system/domain/TdPropertyManager.java | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java
index 4924566..4af7e8d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java
@@ -6,6 +6,7 @@ import java.util.List;
import com.ruoyi.common.utils.uuid.Seq;
import com.ruoyi.system.domain.TdPropertyInfo;
import com.ruoyi.system.service.ITdPropertyInfoService;
+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;
@@ -24,6 +25,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
*
@@ -41,6 +44,9 @@ public class TdPropertyManagerController extends BaseController
@Autowired
private ITdPropertyInfoService tdPropertyInfoService;
+ @Resource
+ private SysAreaManager sysAreaManager;
+
@RequiresPermissions("system:property:view")
@GetMapping()
public String property()
@@ -71,6 +77,10 @@ public class TdPropertyManagerController extends BaseController
public AjaxResult export(TdPropertyManager tdPropertyManager)
{
List<TdPropertyManager> list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
+ list.forEach(tdPropertyManager1 -> {
+ tdPropertyManager1.setPart(sysAreaManager.getAreaName(tdPropertyManager1.getPart()));
+ tdPropertyManager1.setAreaId(sysAreaManager.getAreaName(tdPropertyManager1.getAreaId()));
+ });
ExcelUtil<TdPropertyManager> util = new ExcelUtil<TdPropertyManager>(TdPropertyManager.class);
return util.exportExcel(list, "资产登记数据");
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
index 4a58280..8eed75b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyManager.java
@@ -56,11 +56,11 @@ public class TdPropertyManager extends BaseEntity
private Long shemichengdu;
/** 市 */
- @Excel(name = "市")
+ @Excel(name = "所属市州")
private String part;
/** 区 */
- @Excel(name = "区")
+ @Excel(name = "所属区县")
private String areaId;
/** 网络终端（数量） */
From 830cce03a709d7b21d4a5c414974ad5068c701de Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Fri, 12 Jul 2024 08:48:38 +0800
Subject: [PATCH 6/8] =?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/property/TdPropertyNetController.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java
index a7b3f86..25c068d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyNetController.java
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system.property;
import java.util.List;
import com.ruoyi.common.utils.uuid.Seq;
+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;
@@ -21,6 +22,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
*
@@ -36,6 +39,9 @@ public class TdPropertyNetController extends BaseController
@Autowired
private ITdPropertyNetService tdPropertyNetService;
+ @Resource
+ private SysAreaManager sysAreaManager;
+
@RequiresPermissions("system:network:view")
@GetMapping()
public String network()
@@ -66,6 +72,10 @@ public class TdPropertyNetController extends BaseController
public AjaxResult export(TdPropertyNet tdPropertyNet)
{
List<TdPropertyNet> list = tdPropertyNetService.selectTdPropertyNetList(tdPropertyNet);
+ list.forEach(tdPropertyNet1 -> {
+ tdPropertyNet1.setFramework(sysAreaManager.getAreaName(tdPropertyNet1.getFramework()));
+ tdPropertyNet1.setArea(sysAreaManager.getAreaName(tdPropertyNet1.getArea()));
+ });
ExcelUtil<TdPropertyNet> util = new ExcelUtil<TdPropertyNet>(TdPropertyNet.class);
return util.exportExcel(list, "涉密网络设备数据");
}
From 8e3715404393f8dcad31b65a88189c756acf03b7 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Fri, 12 Jul 2024 08:51:40 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=AF=95=E9=A2=98=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/templates/system/elExam/qu/toImport.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html
index 1067597..3a3101c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/toImport.html
@@ -16,7 +16,7 @@
提示：请下载导入模板（试题导入模板.xlsx），</br> 按照模板要求填写后导入。
</div>
</el-row>
- <el-row>
+ <el-row style="margin-top: 20px">
<div>
<span v-for="(file, index) in fileList" :key="index" style="margin-right: 10px">
{{file.name}}
From 1932d5b242c2bc51580a254bff04d28ce6720c81 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Fri, 12 Jul 2024 08:55:45 +0800
Subject: [PATCH 8/8] =?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
---
.../controller/system/check/TdCheckController.java | 11 +++++++++++
.../system/check/TdCheckResultController.java | 9 +++++++++
.../controller/system/check/TdNotifyController.java | 11 +++++++++++
.../main/java/com/ruoyi/system/domain/TdCheck.java | 9 +++++----
.../main/java/com/ruoyi/system/domain/TdNotify.java | 4 ++--
5 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java
index 32556a7..a816f73 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system.check;
import java.util.List;
+
+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;
@@ -19,6 +21,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
*
@@ -34,6 +38,9 @@ public class TdCheckController extends BaseController
@Autowired
private ITdCheckService tdCheckService;
+ @Resource
+ private SysAreaManager sysAreaManager;
+
@RequiresPermissions("system:check:view")
@GetMapping()
public String check()
@@ -64,6 +71,10 @@ public class TdCheckController extends BaseController
public AjaxResult export(TdCheck tdCheck)
{
List<TdCheck> list = tdCheckService.selectTdCheckList(tdCheck);
+ list.forEach(tdCheck1 -> {
+ tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework()));
+ tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea()));
+ });
ExcelUtil<TdCheck> util = new ExcelUtil<TdCheck>(TdCheck.class);
return util.exportExcel(list, "检查报告管理数据");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java
index 58e5fab..2050ea6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java
@@ -8,12 +8,14 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.TdCheck;
import com.ruoyi.system.service.ITdCheckService;
+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;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
@@ -24,6 +26,9 @@ public class TdCheckResultController extends BaseController {
@Autowired
private ITdCheckService tdCheckService;
+ @Resource
+ private SysAreaManager sysAreaManager;
+
@RequiresPermissions("system:checkresult:view")
@GetMapping()
public String checkresult()
@@ -54,6 +59,10 @@ public class TdCheckResultController extends BaseController {
public AjaxResult export(TdCheck tdCheck)
{
List<TdCheck> list = tdCheckService.selectTdCheckList(tdCheck);
+ list.forEach(tdCheck1 -> {
+ tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework()));
+ tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea()));
+ });
ExcelUtil<TdCheck> util = new ExcelUtil<TdCheck>(TdCheck.class);
return util.exportExcel(list, "检查结果管理数据");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java
index 0a15924..c5ee92a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdNotifyController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system.check;
import java.util.List;
+
+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;
@@ -19,6 +21,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
*
@@ -34,6 +38,9 @@ public class TdNotifyController extends BaseController
@Autowired
private ITdNotifyService tdNotifyService;
+ @Resource
+ private SysAreaManager sysAreaManager;
+
@RequiresPermissions("system:notify:view")
@GetMapping()
public String notice()
@@ -64,6 +71,10 @@ public class TdNotifyController extends BaseController
public AjaxResult export(TdNotify tdNotify)
{
List<TdNotify> list = tdNotifyService.selectTdNotifyList(tdNotify);
+ list.forEach(tdNotify1 -> {
+ tdNotify1.setFramework(sysAreaManager.getAreaName(tdNotify1.getFramework()));
+ tdNotify1.setArea(sysAreaManager.getAreaName(tdNotify1.getArea()));
+ });
ExcelUtil<TdNotify> util = new ExcelUtil<TdNotify>(TdNotify.class);
return util.exportExcel(list, "检查通知数据");
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
index 928626d..2fc6262 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
@@ -62,14 +62,15 @@ public class TdCheck extends BaseEntity
@Excel(name = "部门结果")
private String departreault;
- /** 地区 */
- @Excel(name = "地区")
- private String area;
/** 市州 */
- @Excel(name = "市州")
+ @Excel(name = "所属市州")
private String framework;
+ /** 地区 */
+ @Excel(name = "所属区县")
+ private String area;
+
/** 检查状态 */
@Excel(name = "检查状态", readConverterExp = "0=通过,1=未通过,2=待检查")
private String checkState;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdNotify.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdNotify.java
index 11bae74..542b259 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdNotify.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdNotify.java
@@ -46,11 +46,11 @@ public class TdNotify extends BaseEntity
private String notifyState;
/** 市州 */
- @Excel(name = "市州")
+ @Excel(name = "所属市州")
private String framework;
/** 地区 */
- @Excel(name = "地区")
+ @Excel(name = "所属地区")
private String area;
public void setNotifyId(Long notifyId)