From edd3a37eca0bd68f0023ae47c4c525d7707f6892 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 05 八月 2025 15:20:18 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 6 +++++-
ruoyi-system/src/main/resources/mapper/system/YcFinancialManagementMapper.xml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index f860599..fb8f8a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -90,7 +90,8 @@
break;
}
}else {
-
+ startTime = startTime + " 00:00:00";
+ endTime = endTime + " 23:59:59";
LambdaQueryWrapper<YcFinancialManagement> wrapper = new LambdaQueryWrapper<>();
if(StringUtils.hasLength(query.getProvinceCode())){
wrapper.eq(YcFinancialManagement::getProvinceCode, query.getProvinceCode());
@@ -287,6 +288,9 @@
endTime = format.format(endDate1);
break;
}
+ }else {
+ startTime = startTime + " 00:00:00";
+ endTime = endTime + " 23:59:59";
}
LambdaQueryWrapper<YcFinancialManagement> wrapper = new LambdaQueryWrapper<>();
diff --git a/ruoyi-system/src/main/resources/mapper/system/YcFinancialManagementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/YcFinancialManagementMapper.xml
index f45c3f0..a86f140 100644
--- a/ruoyi-system/src/main/resources/mapper/system/YcFinancialManagementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/YcFinancialManagementMapper.xml
@@ -40,7 +40,7 @@
AND ty.revenue_type = #{query.revenueType}
</if>
<if test="query.typeId != null">
- AND ty.type_id = #{query.typeId}
+ AND fm.type_id = #{query.typeId}
</if>
<if test="query.updateBy != null and query.updateBy != ''">
AND fm.update_by LIKE CONCAT('%',#{query.updateBy},'%')
--
Gitblit v1.7.1