From a7a8a50f48c1bff5ddc52b3bad1782328f8043d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 四月 2024 18:50:20 +0800
Subject: [PATCH] 基础数据配置接口修改
---
ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 99a5d3e..67e1049 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
@@ -6,13 +6,20 @@
import com.ruoyi.system.dto.BasicDataDTO;
import com.ruoyi.system.query.ScoreQuery;
import com.ruoyi.system.service.TbBasicDataService;
+import com.ruoyi.system.service.TbFieldService;
import com.ruoyi.system.vo.BasicDataReportingVO;
import com.ruoyi.system.vo.ScoreVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -21,12 +28,13 @@
*/
@Slf4j
@RestController
-@RequestMapping("/current-quarter")
+@RequestMapping("/current-quarter-dept")
@RequiredArgsConstructor
@Api(tags = "当前季度数据相关接口")
public class CurrentQuarterController {
private final TbBasicDataService tbBasicDataService;
+ private final TbFieldService tbFieldService;
/**
* 获取基础数据填报相关信息
@@ -49,6 +57,7 @@
/**
* 保存当前季度数据
+ *
* @param dto 当前季度基础数据数据传输对象
* @return R<Void>
*/
@@ -66,6 +75,7 @@
}
return R.ok();
}
+
/**
* 导入模板下载
*/
@@ -73,15 +83,16 @@
@ApiOperation("模板下载")
public void downloadImportTemplate() {
try {
- tbBasicDataService.downloadImportTemplate();
+ tbFieldService.downloadImportTemplate();
} catch (Exception e) {
- log.error("模板下载异常",e);
+ log.error("模板下载异常", e);
throw new ServiceException("模板下载失败,请联系管理员！");
}
}
/**
* 基础数据导入
+ *
* @param file file
* @return R<Void>
*/
@@ -94,7 +105,7 @@
if (e instanceof ServiceException) {
return R.fail(e.getMessage());
}
- log.error("基础数据导入异常",e);
+ log.error("基础数据导入异常", e);
return R.fail("基础数据导入失败,请联系管理员！");
}
return R.ok();
@@ -102,19 +113,20 @@
/**
* 得分计算分页查询
+ *
* @param query 得分计算条件查询对象
* @return R<PageDTO < ScoreVO>>
*/
@PostMapping("/page-score")
@ApiOperation("得分计算分页查询")
- public R<PageDTO<ScoreVO>> pageScore(@RequestBody ScoreQuery query) {
+ public R<PageDTO<ScoreVO>> pageScore(@Validated @RequestBody ScoreQuery query) {
try {
return R.ok(tbBasicDataService.pageScore(query));
} catch (Exception e) {
if (e instanceof ServiceException) {
return R.fail(e.getMessage());
}
- log.error("查询得分计算异常",e);
+ log.error("查询得分计算异常", e);
return R.fail();
}
}
--
Gitblit v1.7.1