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 list = tdCheckService.selectTdCheckList(tdCheck); + list.forEach(tdCheck1 -> { + tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework())); + tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea())); + }); ExcelUtil util = new ExcelUtil(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 list = tdCheckService.selectTdCheckList(tdCheck); + list.forEach(tdCheck1 -> { + tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework())); + tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea())); + }); ExcelUtil util = new ExcelUtil(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 list = tdNotifyService.selectTdNotifyList(tdNotify); + list.forEach(tdNotify1 -> { + tdNotify1.setFramework(sysAreaManager.getAreaName(tdNotify1.getFramework())); + tdNotify1.setArea(sysAreaManager.getAreaName(tdNotify1.getArea())); + }); ExcelUtil util = new ExcelUtil(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)