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/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
index bb27d80..c010d2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
@@ -7,7 +7,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.TbQuestion;
import com.ruoyi.system.dto.QuestionDTO;
-import com.ruoyi.system.dto.QuestionUpdDto;
+import com.ruoyi.system.dto.update.QuestionUpdDTO;
import com.ruoyi.system.query.CurrentFieldsQuery;
import com.ruoyi.system.query.QuestionQuery;
import com.ruoyi.system.query.ScoreCalculateDetailQuery;
@@ -15,14 +15,25 @@
import com.ruoyi.system.service.TbBasicDataService;
import com.ruoyi.system.service.TbQuestionService;
import com.ruoyi.system.service.TbScoreService;
-import com.ruoyi.system.vo.*;
+import com.ruoyi.system.vo.CurrentFieldsAllVO;
+import com.ruoyi.system.vo.CurrentFieldsDetailVO;
+import com.ruoyi.system.vo.CurrentFieldsVO;
+import com.ruoyi.system.vo.QuestionVO;
+import com.ruoyi.system.vo.ScoreCalculateDetailVO;
+import com.ruoyi.system.vo.ScoreCalculateVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
* @author mitao
@@ -46,7 +57,8 @@
*/
@ApiOperation(value = "字段统计", notes = "字段统计")
@PostMapping("/fields-statics")
- public R<PageDTO<CurrentFieldsVO>> fieldsStatics(@Validated @RequestBody CurrentFieldsQuery dto) {
+ public R<PageDTO<CurrentFieldsVO>> fieldsStatics(
+ @Validated @RequestBody CurrentFieldsQuery dto) {
try {
dto.setQuarter(DateUtils.getNowQuarter());
return tbBasicDataService.fieldsStatics(dto);
@@ -104,7 +116,8 @@
*/
@PostMapping("/score-calculate")
@ApiOperation("得分计算")
- public R<PageDTO<ScoreCalculateVO>> scoreCalculate(@Validated @RequestBody ScoreCalculateQuery query) {
+ public R<PageDTO<ScoreCalculateVO>> scoreCalculate(
+ @Validated @RequestBody ScoreCalculateQuery query) {
try {
query.setQuarter(DateUtils.getNowQuarter());
return R.ok(tbBasicDataService.scoreCalculatePage(query));
@@ -123,7 +136,8 @@
@PostMapping("/score-calculate-detail")
@ApiOperation("得分计算-查看详情")
@ApiImplicitParam(name = "areaName", value = "部门名称", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class)
- public R<ScoreCalculateDetailVO> scoreCalculateDetail(@Validated @RequestBody ScoreCalculateDetailQuery query) {
+ public R<ScoreCalculateDetailVO> scoreCalculateDetail(
+ @Validated @RequestBody ScoreCalculateDetailQuery query) {
return R.ok(tbScoreService.scoreCalculateDetail(query));
}
@@ -156,7 +170,7 @@
*/
@PostMapping("/edit-question")
@ApiOperation(value = "发现问题-编辑问题", notes = "发现问题")
- public R<Void> editQuestion(@Validated @RequestBody QuestionUpdDto dto) {
+ public R<Void> editQuestion(@Validated @RequestBody QuestionUpdDTO dto) {
try {
tbQuestionService.editQuestion(dto);
return R.ok();
--
Gitblit v1.7.1