bug修复

mitao

2024-04-19 604d00f67ddcf25a9d079ceddd1c668b2a4e5288

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java

@@ -1,12 +1,15 @@
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;
import com.ruoyi.system.dto.update.BasicDataUpdDTO;
import com.ruoyi.system.query.CurrentFieldsQuery;
import com.ruoyi.system.query.HistoryDataQuery;
import com.ruoyi.system.query.QuestionQuery;
@@ -72,7 +75,7 @@
                tbBasicDataService
                        .lambdaQuery()
                        .eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)
                        .between(flag, TbBasicData::getCreateTime, startTime, endTime)
                        .between(flag, TbBasicData::getReportingTime, startTime, endTime)
                        .groupBy(TbBasicData::getQuarter)
                        .orderByDesc(TbBasicData::getReportingTime)
                        .page(new Page<>(dto.getPageNum(), dto.getPageSize()));
@@ -103,7 +106,7 @@
     * @return R<CurrentFieldsDetailVO>
     */
    @GetMapping("/fields-details")
    @ApiOperation(value = "查看详情", notes = "字段统计")
    @ApiOperation(value = "字段统计-查看详情", notes = "字段统计")
    @ApiImplicitParam(
            name = "id",
            value = "基础数据id",
@@ -121,6 +124,21 @@
            log.error("保存当前季度数据异常", e);
            return R.fail();
        }
    }

    @PostMapping("/save-basic-data")
    @ApiOperation("字段统计-保存数据")
    public R<Void> editBasicData(@RequestBody BasicDataUpdDTO dto) {
        try {
            tbBasicDataService.editBasicData(dto);
        } catch (Exception e) {
            if (e instanceof ServiceException) {
                return R.fail(e.getMessage());
            }
            log.error("保存数据异常", e);
            return R.fail();
        }
        return R.ok();
    }

    /**
@@ -190,6 +208,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 +229,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 {