|
@@ -9,6 +9,7 @@
|
|
|
<result column="cooperation_organ_id_" property="cooperationOrganId"/>
|
|
|
<result column="music_group_id_" property="musicGroupId"/>
|
|
|
<result column="is_reserve_" property="isReserve" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
+ <result column="is_send_msg_" property="isSendMsg" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
<result column="create_time_" property="createTime"/>
|
|
|
<result column="update_time_" property="updateTime"/>
|
|
|
</resultMap>
|
|
@@ -51,6 +52,9 @@
|
|
|
<if test="isReserve != null">
|
|
|
is_reserve_ = #{isReserve,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
|
|
|
</if>
|
|
|
+ <if test="isSendMsg != null">
|
|
|
+ is_send_msg_ = #{isSendMsg,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
|
|
|
+ </if>
|
|
|
<if test="createTime != null">
|
|
|
create_time_ = #{createTime},
|
|
|
</if>
|
|
@@ -219,18 +223,19 @@
|
|
|
</select>
|
|
|
<select id="exportStatisticsDetail" resultMap="ChildrenStatisticsDetailDtoMap">
|
|
|
SELECT o.name_ organ_name_,co.name_ cooperation_organ_name_,mg.name_ music_group_name_,cdr.user_id_,
|
|
|
- su.username_,su.phone_,s.name_ subject_name_,st.current_class_,sut.real_name_,cdr.is_reserve_,cdd.grade_level_,cdd.theory_level_,
|
|
|
- CASE WHEN cdd.vip_1v1_price_ > 0 OR cdd.vip_1v2_price_ > 0 THEN 1 ELSE 0 END buy_vip_flag_,
|
|
|
- CASE WHEN cdd.theory_course_price_ > 0 THEN 1 ELSE 0 END buy_theory_course_flag_,cdd.total_amount_
|
|
|
+ su.username_,su.phone_,s.name_
|
|
|
+ subject_name_,st.current_class_,sut.real_name_,cdr.is_reserve_,cdd.grade_level_,cdd.theory_level_,
|
|
|
+ CASE WHEN cdd.vip_1v1_price_ > 0 OR cdd.vip_1v2_price_ > 0 THEN 1 ELSE 0 END buy_vip_flag_,
|
|
|
+ CASE WHEN cdd.theory_course_price_ > 0 THEN 1 ELSE 0 END buy_theory_course_flag_,cdd.total_amount_
|
|
|
FROM children_day_reserve cdr
|
|
|
- LEFT JOIN children_day_degree_info cdd ON cdr.id_ = cdd.reserve_id_
|
|
|
- LEFT JOIN organization o ON o.id_ = cdr.organ_id_
|
|
|
- LEFT JOIN cooperation_organ co ON co.id_ = cdr.cooperation_organ_id_
|
|
|
- LEFT JOIN music_group mg ON mg.id_ = cdr.music_group_id_
|
|
|
- LEFT JOIN student st ON st.user_id_ = cdr.user_id_
|
|
|
- LEFT JOIN sys_user sut ON sut.id_ = st.teacher_id_
|
|
|
- LEFT JOIN sys_user su ON su.id_ = cdr.user_id_
|
|
|
- LEFT JOIN `subject` s ON s.id_ = cdd.subject_id_
|
|
|
+ LEFT JOIN children_day_degree_info cdd ON cdr.id_ = cdd.reserve_id_
|
|
|
+ LEFT JOIN organization o ON o.id_ = cdr.organ_id_
|
|
|
+ LEFT JOIN cooperation_organ co ON co.id_ = cdr.cooperation_organ_id_
|
|
|
+ LEFT JOIN music_group mg ON mg.id_ = cdr.music_group_id_
|
|
|
+ LEFT JOIN student st ON st.user_id_ = cdr.user_id_
|
|
|
+ LEFT JOIN sys_user sut ON sut.id_ = st.teacher_id_
|
|
|
+ LEFT JOIN sys_user su ON su.id_ = cdr.user_id_
|
|
|
+ LEFT JOIN `subject` s ON s.id_ = cdd.subject_id_
|
|
|
<where>
|
|
|
<if test="cooperationId != null">
|
|
|
AND cdr.cooperation_organ_id_ = #{cooperationId}
|
|
@@ -310,14 +315,22 @@
|
|
|
SELECT cdr.*,su.phone_ FROM children_day_reserve cdr
|
|
|
LEFT JOIN sys_user su ON su.id_ = cdr.user_id_
|
|
|
<where>
|
|
|
- <foreach collection="msgDtos" item="msgDto">
|
|
|
+ (cdr.is_reserve_ = 1 AND is_send_msg_ = 0) AND
|
|
|
+ <foreach collection="msgDtos" item="msgDto" open="(" close=")" separator="OR">
|
|
|
<if test="msgDto.musicGroupId != null">
|
|
|
- OR (cdr.organ_id_=#{msgDto.organId} AND cdr.music_group_id_ = #{msgDto.musicGroupId})
|
|
|
+ (cdr.organ_id_=#{msgDto.organId} AND cdr.music_group_id_ = #{msgDto.musicGroupId})
|
|
|
</if>
|
|
|
<if test="msgDto.musicGroupId == null">
|
|
|
- OR (cdr.organ_id_=#{msgDto.organId} AND cdr.music_group_id_ IS NULL)
|
|
|
+ (cdr.organ_id_=#{msgDto.organId} AND cdr.music_group_id_ IS NULL)
|
|
|
</if>
|
|
|
</foreach>
|
|
|
</where>
|
|
|
</select>
|
|
|
+
|
|
|
+ <update id="updateSendMasStatus">
|
|
|
+ UPDATE children_day_reserve SET is_send_msg_ = 1 WHERE user_id_ IN
|
|
|
+ <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
|
|
+ #{userId}
|
|
|
+ </foreach>
|
|
|
+ </update>
|
|
|
</mapper>
|