From 75bac456c3d66f6b173b1213776158c3bc5f8b96 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:24 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index 0daff8f..28720c4 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -134,16 +134,17 @@
</select>
<select id="getStudentTotal" resultType="map">
-
SELECT * from(
SELECT studentId, totalClassHours, name as courseName, laveClassHours,cashPayment as cashPayment,hasHours,appUserId,insertTime
+ ,coursePackageId
FROM (
SELECT studentId, totalClassHours, name, laveClassHours,cashPayment, (totalClassHours - laveClassHours) AS hasHours,py.appUserId,py.insertTime
+ ,coursePackageId
FROM t_course_package_payment py
LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
UNION ALL
SELECT studentId, SUM(totalClassHours) AS totalClassHours,'总计' as name, SUM(laveClassHours) AS laveClassHours, SUM(cashPayment) AS cashPayment,
- (SUM(totalClassHours) - SUM(laveClassHours)) AS hasHours,py.appUserId,py.insertTime
+ (SUM(totalClassHours) - SUM(laveClassHours)) AS hasHours,py.appUserId,py.insertTime,py.coursePackageId
FROM t_course_package_payment py
LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
GROUP BY studentId
@@ -154,7 +155,12 @@
<if test="null != start and '' != start and null != end and '' != end">
a.insertTime between #{start} and #{end}
</if>
-
+ <if test="coursePackageIds != null and coursePackageIds.size()>0">
+ AND a.coursePackageId IN
+ <foreach collection="coursePackageIds" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
</where>
</select>
@@ -173,9 +179,13 @@
FROM
t_course_package_payment py
LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
-
-
<where>
+ <if test="storeIds != null and storeIds.size()>0">
+ AND cp.id IN
+ <foreach collection="storeIds" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
<if test="null != start and '' != start and null != end and '' != end">
py.insertTime between #{start} and #{end}
</if>
--
Gitblit v1.7.1