From a4a904acc5f4de80d30eafe19dd97f3cc8f56a0b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 17:17:34 +0800
Subject: [PATCH] 新问题 25-9-28
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index d367241..14e36ca 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -258,6 +258,14 @@
public Result page(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
query.setUnitId(SecurityUtils.getUnitId());
+ if (query.getReportTimeEnd() != null) {
+ query.setReportTimeEnd(DateUtils.getDayEnd(query.getReportTimeEnd()));
+ }
+
+ if (query.getEffectTimeEnd() != null) {
+ query.setEffectTimeEnd(DateUtils.getDayEnd(query.getEffectTimeEnd()));
+ }
+
baseMapper.page(page, query);
List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
@@ -342,6 +350,7 @@
item.setResultStr(records.get(0).getResult() ? "閫氳繃" : "鏈�氳繃");
item.setResultRemark(records.get(0).getResultRemark());
item.setAuditingTime(records.get(0).getCreateTime());
+
} else {
item.setResultStr("瀹℃牳涓�");
}
--
Gitblit v1.8.0