update

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

@@ -9,6 +9,8 @@ public class StudentApplyInstrumentDto {
 	private Long studentInstrumentId;
 	
 	private Long studentPyamentOrderId;
+	
+	private Long musicGroupPaymentCalenderId;
 
 	public String getMusicGroupId() {
 		return musicGroupId;
@@ -41,4 +43,12 @@ public class StudentApplyInstrumentDto {
 	public void setStudentPyamentOrderId(Long studentPyamentOrderId) {
 		this.studentPyamentOrderId = studentPyamentOrderId;
 	}
+
+	public Long getMusicGroupPaymentCalenderId() {
+		return musicGroupPaymentCalenderId;
+	}
+
+	public void setMusicGroupPaymentCalenderId(Long musicGroupPaymentCalenderId) {
+		this.musicGroupPaymentCalenderId = musicGroupPaymentCalenderId;
+	}
 }

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

@@ -204,6 +204,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private SysUserCashAccountDao sysUserCashAccountDao;
     @Autowired
     private StudentDao studentDao;
+    
+    @Autowired
+    private MusicGroupPaymentCalenderRepairDao musicGroupPaymentCalenderRepairDao;
 
     private SimpleDateFormat sdf_ymd = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -3898,6 +3901,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         	List<Long> instrumentIdList = maintenanceList.stream().map(t -> t.getStudentInstrumentId()).collect(Collectors.toList());
 
             List<StudentInstrument> studentInstrumentList = studentInstrumentDao.queryById(instrumentIdList);
+            
+            MusicGroupPaymentCalenderRepair musicGroupPaymentCalenderRepair = musicGroupPaymentCalenderRepairDao.findByCalenderId(maintenanceList.get(0).getMusicGroupPaymentCalenderId());
 
             List<StudentInstrument> updateList = new ArrayList<StudentInstrument>();
 
@@ -3908,7 +3913,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (si.getStatus() == 0 && si.getStartTime() == null) {
                     si.setStatus(1);
                     si.setStartTime(date);
-                    si.setEndTime(DateUtil.addYears(date, 1));
+                    si.setEndTime(DateUtil.addYears(date, musicGroupPaymentCalenderRepair.getNum().intValue()));
                     si.setUpdateTime(date);
 
                     updateList.add(si);

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

@@ -46,6 +46,7 @@
         <result column="student_instrument_id_" property="studentInstrumentId"/>
         <result column="user_id_" property="userId"/>
         <result column="student_payment_order_id_" property="studentPyamentOrderId"/>
+        <result column="calender_id_" property="musicGroupPaymentCalenderId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -393,7 +394,7 @@
     </select>
 
     <select id="queryByType" resultMap="StudentApplyInstrumentDto" parameterType="map">
-    	select spo.user_id_,spo.music_group_id_,spod.student_instrument_id_ from student_payment_order_detail spod left join student_payment_order spo on spod.payment_order_id_ = spo.id_ 
+    	select spo.user_id_,spo.music_group_id_,spo.calender_id_,spod.student_instrument_id_ from student_payment_order_detail spod left join student_payment_order spo on spod.payment_order_id_ = spo.id_ 
         WHERE spo.music_group_id_ = #{musicGroupId}
         AND spo.type_ = 'APPLY' and spo.status_ = 'SUCCESS' and spod.type_ = #{orderDetailType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>