zouxuan 5 年之前
父節點
當前提交
454d61bb41

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

@@ -30,6 +30,9 @@ public class MusicGroupPaymentCalenderDetail {
 	
 	
 	/**  */
 	/**  */
 	private String userStatus;
 	private String userStatus;
+
+	/**1是0否  */
+	private Integer open;
 	
 	
 	/**  */
 	/**  */
 	private java.util.Date payTime;
 	private java.util.Date payTime;
@@ -40,6 +43,14 @@ public class MusicGroupPaymentCalenderDetail {
 	/**  */
 	/**  */
 	private java.util.Date createTime;
 	private java.util.Date createTime;
 
 
+	public Integer getOpen() {
+		return open;
+	}
+
+	public void setOpen(Integer open) {
+		this.open = open;
+	}
+
 	private SysUser sysUser = new SysUser();
 	private SysUser sysUser = new SysUser();
 
 
 	private Student student = new Student();
 	private Student student = new Student();

+ 0 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -1,12 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 package com.ym.mec.biz.dal.entity;
 
 
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.common.enums.BaseEnum;
 import com.ym.mec.common.enums.BaseEnum;
 
 
 /**
 /**

+ 14 - 12
mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderDetailMapper.xml

@@ -15,6 +15,7 @@
 		<result column="pay_time_" property="payTime" />
 		<result column="pay_time_" property="payTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 		<result column="create_time_" property="createTime" />
+		<result column="open_" property="open" />
 		<association property="sysUser" javaType="com.ym.mec.auth.api.entity.SysUser">
 		<association property="sysUser" javaType="com.ym.mec.auth.api.entity.SysUser">
 			<result column="username_" property="username" />
 			<result column="username_" property="username" />
 		</association>
 		</association>
@@ -40,16 +41,17 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO music_group_payment_calender_detail
 		INSERT INTO music_group_payment_calender_detail
-		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,user_status_,pay_time_,update_time_,create_time_)
-		VALUES(#{id},#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},#{paymentStatus},#{userStatus},#{payTime},#{updateTime},#{createTime})
+		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,user_status_,pay_time_,update_time_,create_time_,open_)
+		VALUES(#{id},#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},#{paymentStatus},#{userStatus},#{payTime},#{updateTime},#{createTime},#{open})
 	</insert>
 	</insert>
 
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
         INSERT INTO music_group_payment_calender_detail
         INSERT INTO music_group_payment_calender_detail
-		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,user_status_,pay_time_,update_time_,create_time_)
+		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,user_status_,pay_time_,update_time_,create_time_,open_)
 		VALUES
 		VALUES
 		<foreach collection="list" item="item" separator=",">
 		<foreach collection="list" item="item" separator=",">
-            (#{item.id},#{item.musicGroupPaymentCalenderId},#{item.userId},#{item.expectAmount},#{item.actualAmount},#{item.paymentStatus},#{item.userStatus},#{item.payTime},#{item.updateTime},#{item.createTime})
+            (#{item.id},#{item.musicGroupPaymentCalenderId},#{item.userId},#{item.expectAmount},
+            #{item.actualAmount},#{item.paymentStatus},#{item.userStatus},#{item.payTime},#{item.updateTime},#{item.createTime},#{item.open})
         </foreach>
         </foreach>
     </insert>
     </insert>
 
 
@@ -58,6 +60,9 @@
 		parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
 		parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
 		UPDATE music_group_payment_calender_detail
 		UPDATE music_group_payment_calender_detail
 		<set>
 		<set>
+			<if test="open != null">
+				open_ = #{open},
+			</if>
 			<if test="userId != null">
 			<if test="userId != null">
 				user_id_ = #{userId},
 				user_id_ = #{userId},
 			</if>
 			</if>
@@ -67,9 +72,6 @@
 			<if test="paymentStatus != null">
 			<if test="paymentStatus != null">
 				payment_status_ = #{paymentStatus},
 				payment_status_ = #{paymentStatus},
 			</if>
 			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="expectAmount != null">
 			<if test="expectAmount != null">
 				expect_amount_ = #{expectAmount},
 				expect_amount_ = #{expectAmount},
 			</if>
 			</if>
@@ -85,9 +87,6 @@
 			<if test="payTime != null">
 			<if test="payTime != null">
 				pay_time_ = #{payTime},
 				pay_time_ = #{payTime},
 			</if>
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
 		</set>
 		</set>
 		WHERE id_ = #{id}
 		WHERE id_ = #{id}
 	</update>
 	</update>
@@ -95,6 +94,9 @@
 		<foreach collection="calenderDetails" item="item" index="index" open="" close="" separator=";">
 		<foreach collection="calenderDetails" item="item" index="index" open="" close="" separator=";">
 			UPDATE music_group_payment_calender_detail
 			UPDATE music_group_payment_calender_detail
 			<set>
 			<set>
+				<if test="item.open != null">
+					open_ = #{item.open},
+				</if>
 				<if test="item.userId != null">
 				<if test="item.userId != null">
 					user_id_ = #{item.userId},
 					user_id_ = #{item.userId},
 				</if>
 				</if>
@@ -162,7 +164,7 @@
 		LEFT JOIN `subject` st ON FIND_IN_SET(st.id_,s.subject_id_list_)
 		LEFT JOIN `subject` st ON FIND_IN_SET(st.id_,s.subject_id_list_)
 		<where>
 		<where>
 			<if test="userId != null">
 			<if test="userId != null">
-				user_id_ = #{userId}
+				mgpc.user_id_ = #{userId}
 			</if>
 			</if>
 			<if test="id != null">
 			<if test="id != null">
 				mgpc.music_group_payment_calender_id_ = #{id}
 				mgpc.music_group_payment_calender_id_ = #{id}
@@ -171,7 +173,7 @@
 				FIND_IN_SET(#{subjectId},s.subject_id_list_)
 				FIND_IN_SET(#{subjectId},s.subject_id_list_)
 			</if>
 			</if>
 			<if test="paymentStatus != null">
 			<if test="paymentStatus != null">
-				payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				mgpc.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			</if>
 		</where>
 		</where>
 	</select>
 	</select>