From a93ad50197f1626a12ba5067639119400542f455 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 11 十月 2025 18:01:52 +0800
Subject: [PATCH] 修改指定季度获取方式
---
finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java b/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java
index 9ecbf1c..b3bfd46 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/api/CurrentQuarterController.java
@@ -31,6 +31,7 @@
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -57,6 +58,9 @@
private final TbScoreService tbScoreService;
private final ISysUserService sysUserService;
+ @Value("${fdb.quarter}")
+ private String quarter;
+
/**
* 字段统计
*
@@ -67,7 +71,9 @@
public R<PageDTO<CurrentFieldsVO>> fieldsStatics(
@Validated @RequestBody CurrentFieldsQuery dto) {
try {
- dto.setQuarter(DateUtils.getNowQuarter());
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = quarter;
+ dto.setQuarter(previousQuarter);
return tbBasicDataService.fieldsStatics(dto);
} catch (Exception e) {
log.error("获取字段统计相关信息异常", e);
@@ -147,7 +153,9 @@
public R<PageDTO<ScoreCalculateVO>> scoreCalculate(
@Validated @RequestBody ScoreCalculateQuery query) {
try {
- query.setQuarter(DateUtils.getNowQuarter());
+ String previousQuarter = DateUtils.getPreviousQuarter();
+ previousQuarter = quarter;
+ query.setQuarter(previousQuarter);
return R.ok(tbBasicDataService.scoreCalculatePage(query));
} catch (Exception e) {
log.error("获取得分计算异常", e);
@@ -163,10 +171,13 @@
*/
@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) {
- return R.ok(tbScoreService.scoreCalculateDetail(query));
+ try {
+ return R.ok(tbScoreService.scoreCalculateDetail(query));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
/**
@@ -245,7 +256,7 @@
@DeleteMapping("/delete")
@ApiOperation(value = "发现问题-删除问题", notes = "发现问题")
public R<Void> delete(@RequestParam("id") Long id) {
- tbQuestionService.removeById(id);
+ tbQuestionService.delete(id);
return R.ok();
}
--
Gitblit v1.7.1