|
@@ -567,7 +567,7 @@
|
|
|
</foreach>
|
|
|
</select>
|
|
|
<select id="exportCloudCoachActivationDetails" resultType="com.ym.mec.biz.dal.dto.CloudCoachActivationDetailsDto">
|
|
|
- select o.name_ organName,cto.amount_ amount,cto.student_id_ studentId,cto.create_time_ createTime,su.username_ studentName,
|
|
|
+ select o.name_ organName,cto.amount_ amount,cto.student_id_ studentId,cto.start_time_ createTime,su.username_ studentName,
|
|
|
CASE WHEN cto.type_ = 'MONTH' THEN CONCAT(cto.time_,'月')
|
|
|
WHEN cto.type_ = 'YEAR' THEN CONCAT(cto.time_ * 12,'月')
|
|
|
WHEN cto.type_ = 'YEAR_HALF' THEN CONCAT(cto.time_ * 6,'月')
|
|
@@ -581,8 +581,8 @@
|
|
|
AND FIND_IN_SET(cto.organ_id_,#{organId})
|
|
|
</if>
|
|
|
<if test="month != null and month != ''">
|
|
|
- AND DATE_FORMAT(cto.create_time_,'%Y-%m') = #{month}
|
|
|
+ AND DATE_FORMAT(cto.start_time_,'%Y-%m') = #{month}
|
|
|
</if>
|
|
|
- ORDER BY o.id_ DESC,cto.create_time_ DESC
|
|
|
+ ORDER BY o.id_ DESC,cto.start_time_ DESC
|
|
|
</select>
|
|
|
</mapper>
|