Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentCalenderAuditDto.java

@@ -10,6 +10,8 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "缴费项目编号",required = false)
     private Long musicGroupPaymentCalenderId;
 
+    private Integer musicGroupOrganizationCourseSettingsId;
+
     @ApiModelProperty(value = "分部编号",required = false)
     private Integer organId;
 
@@ -81,6 +83,14 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "是否赠送网管课",required = false)
     private Boolean isGiveMusicNetwork;
 
+    public Integer getMusicGroupOrganizationCourseSettingsId() {
+        return musicGroupOrganizationCourseSettingsId;
+    }
+
+    public void setMusicGroupOrganizationCourseSettingsId(Integer musicGroupOrganizationCourseSettingsId) {
+        this.musicGroupOrganizationCourseSettingsId = musicGroupOrganizationCourseSettingsId;
+    }
+
     public String getBatchNo() {
         return batchNo;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderCourseSettings.java

@@ -10,9 +10,6 @@ public class MusicGroupPaymentCalenderCourseSettings {
 
 	/**  */
 	private Integer id;
-
-	/**  */
-	private Integer musicGroupOrganizationCourseSettingsId;
 	
 	/**  */
 	private Long musicGroupPaymentCalenderId;
@@ -44,14 +41,6 @@ public class MusicGroupPaymentCalenderCourseSettings {
 	/**  */
 	private java.util.Date updateTime;
 
-	public Integer getMusicGroupOrganizationCourseSettingsId() {
-		return musicGroupOrganizationCourseSettingsId;
-	}
-
-	public void setMusicGroupOrganizationCourseSettingsId(Integer musicGroupOrganizationCourseSettingsId) {
-		this.musicGroupOrganizationCourseSettingsId = musicGroupOrganizationCourseSettingsId;
-	}
-
 	public void setStudentOptional(boolean studentOptional) {
 		isStudentOptional = studentOptional;
 	}

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderCourseSettingsMapper.xml

@@ -9,7 +9,6 @@
 		id="MusicGroupPaymentCalenderCourseSettings">
 		<result column="id_" property="id" />
 		<result column="music_group_payment_calender_id_" property="musicGroupPaymentCalenderId" />
-		<result column="music_group_organization_course_settings_id_" property="musicGroupOrganizationCourseSettingsId" />
 		<result column="course_type_" property="courseType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="course_total_minuties_" property="courseTotalMinuties" />
 		<result column="unit_price_" property="unitPrice" />
@@ -153,7 +152,7 @@
 		WHERE mgpccs.music_group_payment_calender_id_ = #{calenderId}
 	</select>
 	<select id="queryCalenderCourseSettingsByBatchNo" resultMap="MusicGroupPaymentCalenderCourseSettings">
-		SELECT MAX(mgpccs.music_group_payment_calender_id_) music_group_payment_calender_id_,MAX(mgpc.music_group_organization_course_settings_id_) music_group_organization_course_settings_id_,
+		SELECT MAX(mgpccs.music_group_payment_calender_id_) music_group_payment_calender_id_,
 		mgpccs.course_type_,SUM(mgpccs.course_total_minuties_) course_total_minuties_,SUM(mgpccs.unit_price_) unit_price_,SUM(mgpccs.course_original_price_)course_original_price_,
 				SUM(mgpccs.course_current_price_)course_current_price_,MAX(mgpccs.is_student_optional_)is_student_optional_,MAX(mgpccs.name_)name_ FROM music_group_payment_calender_course_settings mgpccs
 		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpccs.music_group_payment_calender_id_

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -405,6 +405,7 @@
 
     <resultMap id="MusicGroupPaymentCalenderAuditDtoMap" type="com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto">
         <result property="musicGroupId" column="music_group_id_"/>
+        <result column="music_group_organization_course_settings_id_" property="musicGroupOrganizationCourseSettingsId" />
         <result property="batchNo" column="batch_no_"/>
         <result property="musicGroupName" column="music_group_name_"/>
         <result property="organId" column="organ_id_"/>
@@ -482,7 +483,7 @@
     </select>
     <select id="getAuditDetail" resultMap="MusicGroupPaymentCalenderAuditDtoMap">
         SELECT mgpc.batch_no_,MAX(mgpc.music_group_id_) music_group_id_
-        ,MAX(mgpc.create_time_) create_time_,MAX(mgpc.payment_type_) payment_type_,
+        ,MAX(mgpc.create_time_) create_time_,MAX(mgpc.payment_type_) payment_type_,MAX(mgpc.music_group_organization_course_settings_id_) music_group_organization_course_settings_id_,
         MAX(mgpc.pay_user_type_) pay_user_type_,MAX(mg.name_) music_group_name_,MAX(mgpc.payment_pattern_)payment_pattern_,MAX(o.name_) organ_name_
         FROM music_group_payment_calender mgpc
         LEFT JOIN music_group mg ON mg.id_ = mgpc.music_group_id_
@@ -512,7 +513,7 @@
         AND pay_user_type_='STUDENT'
     </select>
     <select id="queryUserPaymentStatus" resultType="java.util.Map">
-        SELECT mg.id_ 'key',CASE WHEN MIN(mgpcd.payment_status_) IS NULL THEN 'NON_PAYMENT' ELSE MIN(mgpcd.payment_status_) END 'value'
+        SELECT mg.id_ 'key',CASE WHEN MIN(mgpcd.payment_status_) IS NULL THEN 'PAID_COMPLETED' ELSE MIN(mgpcd.payment_status_) END 'value'
         FROM music_group mg
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.music_group_id_ = mg.id_
         AND mgpc.status_ IN ('NO','OPEN','OVER')
@@ -523,7 +524,7 @@
     </select>
     <select id="queryUserCoursePaymentStatus" resultType="java.util.Map">
         SELECT mgpcd.user_id_ 'key',
-        CASE WHEN MIN(mgpcd.payment_status_) IS NULL THEN 'NON_PAYMENT' ELSE MIN(mgpcd.payment_status_) END 'value'
+        CASE WHEN MIN(mgpcd.payment_status_) IS NULL THEN 'PAID_COMPLETED' ELSE MIN(mgpcd.payment_status_) END 'value'
         FROM music_group mg
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.music_group_id_ = mg.id_
         AND mgpc.status_ IN ('NO','OPEN','OVER')