From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
index f1b72e4..f0ba5b1 100644
--- a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
+++ b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/CurrentQuarterController.java
@@ -1,11 +1,14 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.annotation.FinancialLog;
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.BasicDataDTO;
import com.ruoyi.system.query.ScoreQuery;
import com.ruoyi.system.service.TbBasicDataService;
+import com.ruoyi.system.service.TbFieldService;
import com.ruoyi.system.vo.BasicDataReportingVO;
import com.ruoyi.system.vo.ScoreVO;
import io.swagger.annotations.Api;
@@ -13,7 +16,12 @@
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.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.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -28,6 +36,7 @@
public class CurrentQuarterController {
private final TbBasicDataService tbBasicDataService;
+ private final TbFieldService tbFieldService;
/**
* 获取基础数据填报相关信息
@@ -50,6 +59,7 @@
/**
* 保存当前季度数据
+ *
* @param dto 当前季度基础数据数据传输对象
* @return R<Void>
*/
@@ -67,27 +77,31 @@
}
return R.ok();
}
+
/**
* 导入模板下载
*/
+ @FinancialLog(title = "下载导入模板", businessType = BusinessType.OTHER)
@GetMapping("/download")
@ApiOperation("模板下载")
public void downloadImportTemplate() {
try {
- tbBasicDataService.downloadImportTemplate();
+ tbFieldService.downloadImportTemplate();
} catch (Exception e) {
- log.error("模板下载异常",e);
+ log.error("模板下载异常", e);
throw new ServiceException("模板下载失败,请联系管理员！");
}
}
/**
* 基础数据导入
+ *
* @param file file
* @return R<Void>
*/
@PostMapping("/import")
@ApiOperation("基础数据导入")
+ @FinancialLog(title = "导入数据", businessType = BusinessType.IMPORT)
public R<Void> importBasicData(@RequestPart("file") MultipartFile file) {
try {
tbBasicDataService.importBasicData(file);
@@ -95,7 +109,7 @@
if (e instanceof ServiceException) {
return R.fail(e.getMessage());
}
- log.error("基础数据导入异常",e);
+ log.error("基础数据导入异常", e);
return R.fail("基础数据导入失败,请联系管理员！");
}
return R.ok();
@@ -103,6 +117,7 @@
/**
* 得分计算分页查询
+ *
* @param query 得分计算条件查询对象
* @return R<PageDTO < ScoreVO>>
*/
@@ -115,7 +130,7 @@
if (e instanceof ServiceException) {
return R.fail(e.getMessage());
}
- log.error("查询得分计算异常",e);
+ log.error("查询得分计算异常", e);
return R.fail();
}
}
--
Gitblit v1.7.1