From 3a6f2b349aaac3fd9f895c16f7d833252a2158ab Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 八月 2024 15:26:25 +0800
Subject: [PATCH] bug修改
---
finance-admin/src/main/java/com/finance/web/controller/api/HistoryDataController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/api/HistoryDataController.java b/finance-admin/src/main/java/com/finance/web/controller/api/HistoryDataController.java
index b725348..8ad69b4 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/api/HistoryDataController.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/api/HistoryDataController.java
@@ -6,7 +6,6 @@
import com.finance.common.basic.PageDTO;
import com.finance.common.core.domain.R;
import com.finance.common.enums.BusinessType;
-import com.finance.common.enums.ReportingStatusEnum;
import com.finance.common.exception.ServiceException;
import com.finance.system.domain.TbBasicData;
import com.finance.system.dto.update.BasicDataUpdDTO;
@@ -74,7 +73,7 @@
Page<TbBasicData> page =
tbBasicDataService
.lambdaQuery()
- .eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)
+ // .eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)
.between(flag, TbBasicData::getReportingTime, startTime, endTime)
.groupBy(TbBasicData::getQuarter)
.orderByDesc(TbBasicData::getReportingTime)
@@ -190,7 +189,11 @@
@ApiOperation("得分计算-查看详情")
public R<ScoreCalculateDetailVO> scoreCalculateDetail(
@Validated @RequestBody ScoreCalculateDetailQuery query) {
- return R.ok(tbScoreService.scoreCalculateDetail(query));
+ try {
+ return R.ok(tbScoreService.scoreCalculateHistoryDetail(query));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
/**
--
Gitblit v1.7.1