|  | @@ -29,8 +29,8 @@
 | 
											
												
													
														|  |          <!--@mbg.generated-->
 |  |          <!--@mbg.generated-->
 | 
											
												
													
														|  |          insert into children_day_reserve (user_id_, organ_id_, cooperation_organ_id_, music_group_id_, is_reserve_,
 |  |          insert into children_day_reserve (user_id_, organ_id_, cooperation_organ_id_, music_group_id_, is_reserve_,
 | 
											
												
													
														|  |          create_time_, update_time_)
 |  |          create_time_, update_time_)
 | 
											
												
													
														|  | -        values (#{userId}, #{organId}, #{cooperationOrganId}, #{musicGroupId}, #{isReserve,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 |  | 
 | 
											
												
													
														|  | -        #{createTime}, #{updateTime})
 |  | 
 | 
											
												
													
														|  | 
 |  | +        values (#{userId}, #{organId}, #{cooperationOrganId}, #{musicGroupId},
 | 
											
												
													
														|  | 
 |  | +        #{isReserve,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(), NOW())
 | 
											
												
													
														|  |      </insert>
 |  |      </insert>
 | 
											
												
													
														|  |      <update id="update" parameterType="com.ym.mec.biz.dal.entity.ChildrenDayReserve">
 |  |      <update id="update" parameterType="com.ym.mec.biz.dal.entity.ChildrenDayReserve">
 | 
											
												
													
														|  |          <!--@mbg.generated-->
 |  |          <!--@mbg.generated-->
 | 
											
										
											
												
													
														|  | @@ -87,14 +87,16 @@
 | 
											
												
													
														|  |          <result property="reserveNum" column="reserve_num_"/>
 |  |          <result property="reserveNum" column="reserve_num_"/>
 | 
											
												
													
														|  |      </resultMap>
 |  |      </resultMap>
 | 
											
												
													
														|  |      <select id="queryChildrenStatistics" resultMap="ChildrenStatisticsDtoMap">
 |  |      <select id="queryChildrenStatistics" resultMap="ChildrenStatisticsDtoMap">
 | 
											
												
													
														|  | -        SELECT o.name_ organ_name_,co.name_ cooperation_organ_name_,mg.name_ music_group_name_,COUNT(sr.user_id_) normal_num_,
 |  | 
 | 
											
												
													
														|  | -               COUNT(CASE WHEN cdr.is_reserve_ = 1 THEN 1 ELSE NULL END) 'reserve_num_',
 |  | 
 | 
											
												
													
														|  | -               COUNT(CASE WHEN cdr.is_reserve_ = 0 THEN 1 ELSE NULL END) 'no_reserve_num_'
 |  | 
 | 
											
												
													
														|  | 
 |  | +        SELECT o.name_ organ_name_,co.name_ cooperation_organ_name_,mg.name_ music_group_name_,COUNT(sr.user_id_)
 | 
											
												
													
														|  | 
 |  | +        normal_num_,
 | 
											
												
													
														|  | 
 |  | +        COUNT(CASE WHEN cdr.is_reserve_ = 1 THEN 1 ELSE NULL END) 'reserve_num_',
 | 
											
												
													
														|  | 
 |  | +        COUNT(CASE WHEN cdr.is_reserve_ = 0 THEN 1 ELSE NULL END) 'no_reserve_num_'
 | 
											
												
													
														|  |          FROM children_day_reserve cdr
 |  |          FROM children_day_reserve cdr
 | 
											
												
													
														|  | -                 LEFT JOIN music_group mg ON mg.id_ = cdr.music_group_id_
 |  | 
 | 
											
												
													
														|  | -                 LEFT JOIN student_registration sr ON sr.music_group_id_ = cdr.music_group_id_ AND sr.music_group_status_ = 'NORMAL'
 |  | 
 | 
											
												
													
														|  | -                 LEFT JOIN cooperation_organ co ON co.id_ = cdr.cooperation_organ_id_
 |  | 
 | 
											
												
													
														|  | -                 LEFT JOIN organization o ON o.id_ = cdr.organ_id_
 |  | 
 | 
											
												
													
														|  | 
 |  | +        LEFT JOIN music_group mg ON mg.id_ = cdr.music_group_id_
 | 
											
												
													
														|  | 
 |  | +        LEFT JOIN student_registration sr ON sr.music_group_id_ = cdr.music_group_id_ AND sr.music_group_status_ =
 | 
											
												
													
														|  | 
 |  | +        'NORMAL'
 | 
											
												
													
														|  | 
 |  | +        LEFT JOIN cooperation_organ co ON co.id_ = cdr.cooperation_organ_id_
 | 
											
												
													
														|  | 
 |  | +        LEFT JOIN organization o ON o.id_ = cdr.organ_id_
 | 
											
												
													
														|  |          <include refid="queryChildrenStatisticsSql"/>
 |  |          <include refid="queryChildrenStatisticsSql"/>
 | 
											
												
													
														|  |          GROUP BY cdr.music_group_id_
 |  |          GROUP BY cdr.music_group_id_
 | 
											
												
													
														|  |      </select>
 |  |      </select>
 |