yonge 5 years ago
parent
commit
bbf8638808

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderDetail.java

@@ -40,9 +40,9 @@ public class MusicGroupPaymentCalenderDetail {
 	/**  */
 	private java.util.Date createTime;
 
-	private SysUser sysUser;
+	private SysUser sysUser = new SysUser();
 
-	private Student student;
+	private Student student = new Student();
 
 	public Student getStudent() {
 		return student;

+ 6 - 1
mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderDetailMapper.xml

@@ -141,6 +141,9 @@
 			<if test="userId != null">
 				mgpc.user_id_ = #{userId}
 			</if>
+			<if test="id != null">
+				mgpc.music_group_payment_calender_id_ = #{id}
+			</if>
 			<if test="paymentStatus != null">
 				mgpc.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -148,7 +151,6 @@
 				FIND_IN_SET(#{subjectId},s.subject_id_list_)
 			</if>
 		</where>
-		GROUP BY mgpc.id_
 		ORDER BY mgpc.create_time_
 		<include refid="global.limit" />
 	</select>
@@ -162,6 +164,9 @@
 			<if test="userId != null">
 				user_id_ = #{userId}
 			</if>
+			<if test="id != null">
+				mgpc.music_group_payment_calender_id_ = #{id}
+			</if>
 			<if test="subjectId != null">
 				FIND_IN_SET(#{subjectId},s.subject_id_list_)
 			</if>