From 321d507a5670cb36c1550445c4795a76c9d7d226 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 03 四月 2024 18:06:49 +0800
Subject: [PATCH] 部门端历史数据模块、字段查看模块返回数据层级关系处理
---
ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
index 711cf98..458aa5e 100644
--- a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
+++ b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
@@ -30,10 +30,9 @@
@ApiOperation("获取基础数据填报相关信息")
@GetMapping("/basic-fields")
- public R<BasicDataReportingVO> getBasicFields(@RequestParam("deptAreaCode") String deptAreaCode) {
- //TODO 如果能够获取到当前登录用户，则不需要传区划代码
+ public R<BasicDataReportingVO> getBasicFields() {
try {
- return tbBasicDataService.getBasicFields(deptAreaCode);
+ return tbBasicDataService.getBasicFields();
} catch (Exception e) {
if (e instanceof ServiceException) {
return R.fail(e.getMessage());
@@ -62,14 +61,13 @@
*/
@GetMapping("/download")
@ApiOperation("模板下载")
- public R<Void> downloadImportTemplate() {
+ public void downloadImportTemplate() {
try {
tbBasicDataService.downloadImportTemplate();
} catch (Exception e) {
log.error("模板下载异常",e);
- return R.fail("模板下载失败,请联系管理员！");
+ throw new ServiceException("模板下载失败,请联系管理员！");
}
- return R.ok();
}
@PostMapping("/import")
--
Gitblit v1.7.1