From afe21cabc75e56e44aafbd461ebdade8b77aefff Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 15 九月 2026 14:05:51 +0800
Subject: [PATCH] 案例趋势相关统计
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index 27007a2..c41a3e9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -464,7 +464,7 @@
private String notAdminId;
/**
- * 鍗忚皟鍛樺鍚�
+ * 鍦板尯
*/
@ApiModelProperty("鍦板尯")
@Excel(name = "鍦板尯", readConverterExp = "鍦板尯")
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
index 8df8714..935f400 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
@@ -6,14 +6,14 @@
<select id="caseTrend" parameterType="com.ruoyi.project.domain.ServiceTotals"
resultType="ServiceTotals">
- SELECT DATE_FORMAT(a.ReportTime, '%Y-%m') donateTime, residencecountyname area, COUNT(*) potentialCount,COUNT(IF(complete_state=3, true, null)) completeCount FROM service_donatebaseinfo_report a
+ SELECT DATE_FORMAT(a.ReportTime, '%Y-%m') donateTime, register_county_name area, COUNT(*) potentialCount,COUNT(IF(complete_state=3, true, null)) completeCount FROM service_donatebaseinfo_report a
LEFT JOIN service_donatecompletioninfo b ON b.InfoID=a.id and a.del_flag=0 and b.del_flag=0
<where>
- <if test="area != null and area != ''">and residencecountyname>=#{area}</if>
+ <if test="area != null and area != ''">and register_county_name>=#{area}</if>
<if test="startTime != null and startTime != ''">and a.ReportTime>=#{startTime}</if>
<if test="endTime != null and endTime != ''">and a.ReportTime <= #{endTime}</if>
</where>
- GROUP BY residencecountyname, DATE_FORMAT(a.ReportTime, '%Y-%m')
+ GROUP BY register_county_name, DATE_FORMAT(a.ReportTime, '%Y-%m')
</select>
<select id="caseTrendMoon" parameterType="com.ruoyi.project.domain.ServiceTotals"
@@ -21,7 +21,7 @@
SELECT DATE_FORMAT(a.ReportTime, '%Y-%m') donateTime, COUNT(*) potentialCount,COUNT(IF(complete_state=3, true, null)) completeCount FROM service_donatebaseinfo a
LEFT JOIN service_donatecompletioninfo b ON b.InfoID=a.id and a.del_flag=0 and b.del_flag=0
<where>
- <if test="area != null and area != ''">and residencecountyname>=#{area}</if>
+ <if test="area != null and area != ''">and register_county_name>=#{area}</if>
<if test="startTime != null and startTime != ''">and a.ReportTime>=#{startTime}</if>
<if test="endTime != null and endTime != ''">and a.ReportTime <= #{endTime}</if>
</where>
@@ -30,14 +30,14 @@
<select id="caseTrendArea" parameterType="com.ruoyi.project.domain.ServiceTotals"
resultType="ServiceTotals">
- SELECT residencecountyname area, COUNT(*) potentialCount,COUNT(IF(complete_state=3, true, null)) completeCount FROM service_donatebaseinfo a
+ SELECT register_county_name area, COUNT(*) potentialCount,COUNT(IF(complete_state=3, true, null)) completeCount FROM service_donatebaseinfo a
LEFT JOIN service_donatecompletioninfo b ON b.InfoID=a.id and a.del_flag=0 and b.del_flag=0
<where>
- <if test="area != null and area != ''">and residencecountyname>=#{area}</if>
+ <if test="area != null and area != ''">and register_county_name>=#{area}</if>
<if test="startTime != null and startTime != ''">and a.ReportTime>=#{startTime}</if>
<if test="endTime != null and endTime != ''">and a.ReportTime <= #{endTime}</if>
</where>
- GROUP BY residencecountyname
+ GROUP BY register_county_name
</select>
<select id="organ" parameterType="com.ruoyi.project.domain.ServiceTotals"
--
Gitblit v1.9.3