From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java | 14 ++++++++------
1 files changed, 8 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..d4c52a7 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
@@ -2,7 +2,9 @@
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.dto.BasicDataDTO;
import com.ruoyi.system.query.ScoreQuery;
import com.ruoyi.system.service.TbBasicDataService;
@@ -30,10 +32,11 @@
@ApiOperation("获取基础数据填报相关信息")
@GetMapping("/basic-fields")
- public R<BasicDataReportingVO> getBasicFields(@RequestParam("deptAreaCode") String deptAreaCode) {
- //TODO 如果能够获取到当前登录用户，则不需要传区划代码
+ public R<BasicDataReportingVO> getBasicFields() {
try {
- return tbBasicDataService.getBasicFields(deptAreaCode);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ String areaCode = user.getAreaCode();
+ return tbBasicDataService.getBasicFields(areaCode);
} catch (Exception e) {
if (e instanceof ServiceException) {
return R.fail(e.getMessage());
@@ -62,14 +65,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