update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -95,4 +95,17 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
     MusicGroupPaymentCalender getLastStartOne(@Param("musicGroupId") String musicGroupId);
 
     int queryIntersectionByDate(@Param("musicGroupId") String musicGroupId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    /**
+     * @describe 根据指定乐团的有效日期查询交集
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/9/21
+     * @time 10:46
+     * @param musicGroupId:
+     * @param paymentValidStartDate:
+     * @param paymentValidEndDate:
+     * @return int
+     */
+    int queryIntersectionByValidDate(@Param("musicGroupId") String musicGroupId, @Param("paymentValidStartDate") String paymentValidStartDate, @Param("paymentValidEndDate") String paymentValidEndDate);
 }

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

@@ -58,8 +58,16 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 	@ApiModelProperty(value = "开始缴费日期", required = false)
 	private java.util.Date startPaymentDate;
 
+	@ApiModelProperty(value = "截止缴费日期", required = false)
 	private Date deadlinePaymentDate;
 
+	/** 开始缴费日期 */
+	@ApiModelProperty(value = "缴费有效期开始时间", required = false)
+	private String paymentValidStartDate;
+
+	@ApiModelProperty(value = "缴费有效期截止时间", required = false)
+	private String paymentValidEndDate;
+
 	private PaymentStatusEnum paymentStatus;
 
 	private Integer expectNum;
@@ -78,6 +86,22 @@ public class MusicGroupPaymentCalender implements Comparable<MusicGroupPaymentCa
 
 	private String studentIds;
 
+	public String getPaymentValidStartDate() {
+		return paymentValidStartDate;
+	}
+
+	public void setPaymentValidStartDate(String paymentValidStartDate) {
+		this.paymentValidStartDate = paymentValidStartDate;
+	}
+
+	public String getPaymentValidEndDate() {
+		return paymentValidEndDate;
+	}
+
+	public void setPaymentValidEndDate(String paymentValidEndDate) {
+		this.paymentValidEndDate = paymentValidEndDate;
+	}
+
 	public String getStudentIds() {
 		return studentIds;
 	}

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

@@ -58,6 +58,12 @@ public class MusicGroupStudentFee {
 	@ApiModelProperty(value = "最近缴费时间", required = false)
 	private Date latestPaidTime;
 
+	@ApiModelProperty(value = "缴费有效期开始时间", required = false)
+	private String paymentValidStartDate;
+
+	@ApiModelProperty(value = "缴费有效期结束时间", required = false)
+	private String paymentValidEndDate;
+
 	@ApiModelProperty(value = "连续旷到次数", required = false)
 	private Integer continuousAbsenteeismTimes;
 
@@ -98,6 +104,22 @@ public class MusicGroupStudentFee {
 	public MusicGroupStudentFee() {
 	}
 
+	public String getPaymentValidStartDate() {
+		return paymentValidStartDate;
+	}
+
+	public void setPaymentValidStartDate(String paymentValidStartDate) {
+		this.paymentValidStartDate = paymentValidStartDate;
+	}
+
+	public String getPaymentValidEndDate() {
+		return paymentValidEndDate;
+	}
+
+	public void setPaymentValidEndDate(String paymentValidEndDate) {
+		this.paymentValidEndDate = paymentValidEndDate;
+	}
+
 	public SysUser getSysUser() {
 		return sysUser;
 	}

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

@@ -82,6 +82,9 @@ public class StudentRegistration {
     @ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）", required = false)
     private PaymentStatusEnum paymentStatus;
 
+    @ApiModelProperty(value = "缴费有效期截止时间", required = false)
+    private String paymentValidEndDate;
+
     @ApiModelProperty(value = "用户所在乐团状态）",required = false)
     private StudentMusicGroupStatusEnum musicGroupStatus;
 
@@ -111,6 +114,14 @@ public class StudentRegistration {
     //乐团
     private OwnershipType ownershipType;
 
+    public String getPaymentValidEndDate() {
+        return paymentValidEndDate;
+    }
+
+    public void setPaymentValidEndDate(String paymentValidEndDate) {
+        this.paymentValidEndDate = paymentValidEndDate;
+    }
+
     public BigDecimal getBalance() {
         return balance;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -76,7 +76,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 //		String format1 = DateUtil.format(musicGroupPaymentCalender.getDeadlinePaymentDate(), DateUtil.DEFAULT_PATTERN);
 //		int count = musicGroupPaymentCalenderDao.queryIntersectionByDate(musicGroupId, format,format1);
 		if (count > 0) {
-			throw new BizException("缴费时间存在冲突，请修改缴费开始日期");
+			throw new BizException("缴费日期存在冲突，请修改缴费日期");
+		}
+		count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(musicGroupId, musicGroupPaymentCalender.getPaymentValidStartDate(),
+				musicGroupPaymentCalender.getPaymentValidEndDate());
+		if (count > 0) {
+			throw new BizException("缴费有效期存在冲突，请修改缴费有效期");
 		}
 		if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
 			musicGroupPaymentCalender.setPaymentStatus(PaymentStatusEnum.YES);

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

@@ -204,4 +204,10 @@
         AND (DATE_FORMAT(mgpcd.start_payment_date_,'%Y-%m-%d') between #{startTime} AND #{endTime}
         OR DATE_FORMAT(mgpcd.deadline_payment_date_,'%Y-%m-%d') between #{startTime} AND #{endTime})
     </select>
+    <select id="queryIntersectionByValidDate" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM music_group_payment_calender mgpc
+        WHERE music_group_id_ = #{musicGroupId}
+        AND (payment_valid_start_date_ BETWEEN #{paymentValidStartDate} AND #{paymentValidEndDate}
+        OR payment_valid_end_date_ BETWEEN #{paymentValidStartDate} AND #{paymentValidEndDate})
+    </select>
 </mapper>

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

@@ -15,6 +15,8 @@
         <result column="course_fee_" property="courseFee"/>
         <result column="next_payment_date_" property="nextPaymentDate"/>
         <result column="latest_paid_time_" property="latestPaidTime"/>
+        <result column="payment_valid_start_date_" property="paymentValidStartDate"/>
+        <result column="payment_valid_end_date_" property="paymentValidEndDate"/>
         <result column="continuous_absenteeism_times_" property="continuousAbsenteeismTimes"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -42,15 +44,21 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_,subject_id_,payment_status_,temporary_course_fee_,payment_period_list_,remain_network_class_times_)
-		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},#{continuousAbsenteeismTimes},#{subjectId},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{temporaryCourseFee},#{paymentPeriodList},#{remainNetworkClassTimes})
+		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,
+		update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_,subject_id_,
+		payment_status_,temporary_course_fee_,payment_period_list_,remain_network_class_times_,payment_valid_start_date_,payment_valid_end_date_)
+		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},
+		#{continuousAbsenteeismTimes},#{subjectId},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		#{temporaryCourseFee},#{paymentPeriodList},#{remainNetworkClassTimes},#{paymentValidStartDate},#{paymentValidEndDate})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee">
-        INSERT INTO music_group_student_fee_ (music_group_id_,user_id_,create_time_,update_time_,next_payment_date_,subject_id_,payment_status_,course_fee_,payment_period_list_,remain_network_class_times_)
+        INSERT INTO music_group_student_fee_ (music_group_id_,user_id_,create_time_,update_time_,next_payment_date_,
+        subject_id_,payment_status_,course_fee_,payment_period_list_,remain_network_class_times_,payment_valid_start_date_,payment_valid_end_date_)
 		VALUES
 		<foreach collection="musicGroupStudentFees" item="item" separator=",">
-            (#{item.musicGroupId},#{item.userId},NOW(),NOW(),#{nextPaymentDate},#{item.subjectId},#{paymentStatus},#{item.courseFee},#{item.paymentPeriodList},#{item.remainNetworkClassTimes})
+            (#{item.musicGroupId},#{item.userId},NOW(),NOW(),#{nextPaymentDate},#{item.subjectId},
+            #{paymentStatus},#{item.courseFee},#{item.paymentPeriodList},#{item.remainNetworkClassTimes},#{paymentValidStartDate},#{paymentValidEndDate})
         </foreach>
     </insert>
 
@@ -58,6 +66,12 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee">
         UPDATE music_group_student_fee_
         <set>
+            <if test="paymentValidStartDate != null">
+                payment_valid_start_date_ = #{paymentValidStartDate},
+            </if>
+            <if test="paymentValidEndDate != null">
+                payment_valid_end_date_ = #{paymentValidEndDate},
+            </if>
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>

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

@@ -26,6 +26,7 @@
         <result column="parents_phone_" property="parentsPhone"/>
         <result column="parents_company_" property="parentsCompany"/>
         <result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="payment_valid_end_date_" property="paymentValidEndDate"/>
         <result column="music_group_status_" property="musicGroupStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="class_group_name_" property="classGroupName"/>
         <result column="temporary_course_fee_" property="temporaryCourseFee" />
@@ -103,6 +104,7 @@
             <if test="parentsPhone!=null">parents_phone_,</if>
             <if test="parentsCompany!=null">parents_company_,</if>
             <if test="paymentStatus!=null">payment_status_,</if>
+            <if test="paymentValidEndDate != null and paymentValidEndDate != ''">payment_valid_end_date_,</if>
             <if test="classGroupId!=null">class_group_id_,</if>
             <if test="musicGroupStatus!=null">music_group_status_,</if>
             <if test="temporaryCourseFee != null">temporary_course_fee_,</if>
@@ -130,6 +132,7 @@
             <if test="parentsCompany!=null">#{parentsCompany},</if>
             <if test="paymentStatus!=null">#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            <if test="paymentValidEndDate != null and paymentValidEndDate != ''">#{paymentStatus},</if>
             <if test="classGroupId!=null">#{classGroupId},</if>
             <if test="musicGroupStatus!=null">
                 #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -144,6 +147,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
         UPDATE student_registration
         <set>
+            <if test="paymentValidEndDate != null and paymentValidEndDate != ''">
+                payment_valid_end_date_ = #{paymentValidEndDate},
+            </if>
             <if test="parentsPhone != null">
                 parents_phone_ = #{parentsPhone},
             </if>

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -2,7 +2,6 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -57,9 +56,6 @@ public class TaskController extends BaseController {
 	private CoursesGroupService coursesGroupService;
 
 	@Autowired
-	private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
-
-	@Autowired
 	private ExtracurricularExercisesService extracurricularExercisesService;
 	
 	@Autowired