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/HistoryDataController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java
index 40ed183..a961a96 100644
--- a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java
+++ b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/api/HistoryDataController.java
@@ -7,7 +7,7 @@
import com.ruoyi.common.enums.ReportingStatusEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.TbBasicData;
-import com.ruoyi.system.dto.HistoryDataQueryDTO;
+import com.ruoyi.system.query.HistoryDataQuery;
import com.ruoyi.system.query.HistoryScoreQuery;
import com.ruoyi.system.service.TbBasicDataService;
import com.ruoyi.system.service.TbFieldService;
@@ -18,9 +18,16 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import java.util.Objects;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
* @author mitao
@@ -28,7 +35,7 @@
*/
@Slf4j
@RestController
-@RequestMapping("/history-data")
+@RequestMapping("/history-data-dept")
@RequiredArgsConstructor
@Api(tags = "历史数据相关接口")
public class HistoryDataController {
@@ -37,24 +44,45 @@
private final TbFieldService tbFieldService;
private final TbScoreService tbScoreService;
+ /**
+ * 历史数据分页查询
+ *
+ * @param dto 历史数据查询传输对象
+ * @return R<PageDTO < BasicDataVO>>
+ */
@PostMapping("/list")
@ApiOperation("历史数据分页查询")
- public R<PageDTO<BasicDataVO>> list(HistoryDataQueryDTO dto) {
+ public R<PageDTO<BasicDataVO>> list(@Validated @RequestBody HistoryDataQuery dto) {
String areaCode = SecurityUtils.getLoginUser().getUser().getAreaCode();
- Page<TbBasicData> page = tbBasicDataService.lambdaQuery().eq(TbBasicData::getDeptAreaCode, areaCode)
+ Page<TbBasicData> page = tbBasicDataService.lambdaQuery()
+ .eq(TbBasicData::getDeptAreaCode, areaCode)
.eq(TbBasicData::getStatus, ReportingStatusEnum.FILLED)
- .page(new Page<TbBasicData>(dto.getPageNum(), dto.getPageSize()));
+ .between(Objects.nonNull(dto.getStartTime()) && Objects.nonNull(dto.getEndTime()),
+ TbBasicData::getReportingTime, dto.getStartTime(), dto.getEndTime())
+ .page(new Page<>(dto.getPageNum(), dto.getPageSize()));
return R.ok(PageDTO.of(page, BasicDataVO.class));
}
- @GetMapping("/history-fields")
+ /**
+ * 字段查看
+ *
+ * @param id 基础数据id
+ * @return R<BasicDataFieldVO>
+ */
+ @GetMapping("/fields")
@ApiOperation("字段查看")
@ApiImplicitParam(name = "id", value = "基础数据id", required = true, dataType = "int", paramType = "query", dataTypeClass = Long.class)
public R<BasicDataFieldVO> getHistoryFields(@RequestParam("id") Long id) {
return R.ok(tbFieldService.getHistoryFields(id));
}
- @PostMapping("/history-score")
+ /**
+ * 得分计算
+ *
+ * @param query 得分计算条件查询对象
+ * @return R<PageDTO < ScoreVO>>
+ */
+ @PostMapping("/score")
@ApiOperation("得分计算")
public R<PageDTO<ScoreVO>> getHistoryScore(@RequestBody HistoryScoreQuery query) {
return R.ok(tbScoreService.getHistoryScore(query));
--
Gitblit v1.7.1