|
@@ -189,12 +189,14 @@
|
|
<select id="sumCloudCourseAmount" resultType="java.util.Map">
|
|
<select id="sumCloudCourseAmount" resultType="java.util.Map">
|
|
SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf
|
|
SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf
|
|
LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
|
|
LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
|
|
- where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} group by cs.organ_id_;
|
|
|
|
|
|
+ where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
|
|
|
|
+ AND cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} group by cs.organ_id_;
|
|
</select>
|
|
</select>
|
|
<select id="sumCourseAmount" resultType="java.util.Map">
|
|
<select id="sumCourseAmount" resultType="java.util.Map">
|
|
SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
|
|
SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
- where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cssp.actual_price_ > 0 AND cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} group by cs.organ_id_;
|
|
|
|
|
|
+ where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
|
|
|
|
+ AND cssp.actual_price_ > 0 AND cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} group by cs.organ_id_;
|
|
</select>
|
|
</select>
|
|
<select id="sumPersonalCloudAmount" resultType="java.util.Map">
|
|
<select id="sumPersonalCloudAmount" resultType="java.util.Map">
|
|
select cto.organ_id_ 'key',TRUNCATE(SUM(operating_amount_ / TIMESTAMPDIFF(DAY,start_time_,end_time_) *
|
|
select cto.organ_id_ 'key',TRUNCATE(SUM(operating_amount_ / TIMESTAMPDIFF(DAY,start_time_,end_time_) *
|
|
@@ -240,13 +242,15 @@
|
|
<select id="sumCloudCoursePreAmount" resultType="java.util.Map">
|
|
<select id="sumCloudCoursePreAmount" resultType="java.util.Map">
|
|
SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf
|
|
SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf
|
|
LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
|
|
LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
|
|
- where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.class_date_ > #{lastDay}
|
|
|
|
|
|
+ where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0
|
|
|
|
+ AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.class_date_ > #{lastDay}
|
|
group by cs.organ_id_;
|
|
group by cs.organ_id_;
|
|
</select>
|
|
</select>
|
|
<select id="sumCoursePreAmount" resultType="java.util.Map">
|
|
<select id="sumCoursePreAmount" resultType="java.util.Map">
|
|
SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
|
|
SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
- where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.class_date_ > #{lastDay}
|
|
|
|
|
|
+ where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0
|
|
|
|
+ AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.class_date_ > #{lastDay}
|
|
AND cs.group_type_ != 'MUSIC'
|
|
AND cs.group_type_ != 'MUSIC'
|
|
group by cs.organ_id_;
|
|
group by cs.organ_id_;
|
|
</select>
|
|
</select>
|