From d68c61517a3a6d4ec4d47844c21bdc143f99cbab Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 四月 2024 22:58:05 +0800
Subject: [PATCH] 大屏接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java
index 9282397..09b5b0b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java
@@ -1,9 +1,11 @@
package com.ruoyi.web.controller.api;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.FinancialLog;
import com.ruoyi.common.annotation.HistoryGroup;
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.ReportingStatusEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.domain.TbBasicData;
@@ -74,7 +76,7 @@
.eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)
.between(flag, TbBasicData::getCreateTime, startTime, endTime)
.groupBy(TbBasicData::getQuarter)
- .orderByDesc(TbBasicData::getCreateTime)
+ .orderByDesc(TbBasicData::getReportingTime)
.page(new Page<>(dto.getPageNum(), dto.getPageSize()));
return R.ok(PageDTO.of(page, BasicDataVO.class));
}
@@ -190,6 +192,7 @@
@PostMapping("/import")
@ApiOperation("导入历史数据")
+ @FinancialLog(title = "导入数据", businessType = BusinessType.IMPORT)
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "file", paramType = "form"),
@ApiImplicitParam(name = "quarter", value = "季度 e.g. 2024年一季度", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@@ -210,6 +213,7 @@
@PostMapping("/export")
@ApiOperation("导出")
+ @FinancialLog(title = "导出数据", businessType = BusinessType.EXPORT)
@ApiImplicitParam(name = "quarterList", value = "quarterList", allowMultiple = true, dataTypeClass = List.class, paramType = "query")
public void exportData(@RequestParam("quarterList") List<String> quarterList) {
try {
--
Gitblit v1.7.1