Browse Source

增加乐器采购清单确认接口

周箭河 5 years ago
parent
commit
a2e9c17641

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -233,9 +233,17 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
 
 
     /**
     /**
      * 乐团开启缴费
      * 乐团开启缴费
+     *
      * @param musicGroupId
      * @param musicGroupId
      * @param paymentStatus
      * @param paymentStatus
      * @return
      * @return
      */
      */
     int musicGroupOpenPay(@Param("musicGroupId") String musicGroupId, @Param("paymentStatus") PaymentStatusEnum paymentStatus);
     int musicGroupOpenPay(@Param("musicGroupId") String musicGroupId, @Param("paymentStatus") PaymentStatusEnum paymentStatus);
+
+    /**
+     * 删除班级学生
+     * @param classGroupId
+     * @return
+     */
+    int deleteClassGroup(@Param("classGroupId") Integer classGroupId);
 }
 }

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -648,6 +648,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public void delSingle(Integer classGroupId) {
     public void delSingle(Integer classGroupId) {
         //删除学员班级关联关系
         //删除学员班级关联关系
         classGroupStudentMapperDao.deleteByClassId(classGroupId);
         classGroupStudentMapperDao.deleteByClassId(classGroupId);
+        studentRegistrationDao.deleteClassGroup(classGroupId);
         //删除班级
         //删除班级
         classGroupDao.delete(classGroupId);
         classGroupDao.delete(classGroupId);
     }
     }
@@ -655,6 +656,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void delMix(Integer classGroupId) {
     public void delMix(Integer classGroupId) {
+        //删除学员班级关联关系
+        classGroupStudentMapperDao.deleteByClassId(classGroupId);
         //删除班级关系
         //删除班级关系
         classGroupRelationDao.deleteByClassId(classGroupId);
         classGroupRelationDao.deleteByClassId(classGroupId);
         //删除合奏班
         //删除合奏班

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

@@ -54,7 +54,7 @@
 		DELETE FROM class_group_student_mapper WHERE id_ = #{id} 
 		DELETE FROM class_group_student_mapper WHERE id_ = #{id} 
 	</delete>
 	</delete>
     <delete id="deleteByClassId">
     <delete id="deleteByClassId">
-        DELETE FROM class_group_student_mapper WHERE class_group_id_ = #{classGroupId}
+        UPDATE class_group_student_mapper SET status_='QUIT' WHERE class_group_id_ = #{classGroupId} AND status_='NORMAL'
     </delete>
     </delete>
 
 
     <!-- 分页查询 -->
     <!-- 分页查询 -->

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

@@ -475,4 +475,12 @@
         WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_ != 2
         WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_ != 2
         GROUP BY sr.user_id_
         GROUP BY sr.user_id_
     </select>
     </select>
+
+    <!-- 删除学生的班级 -->
+    <update id="deleteClassGroup">
+        UPDATE student_registration
+        SET class_group_id_ = 0,
+        update_time_ = now()
+        WHERE class_group_id_ = #{classGroupId}
+    </update>
 </mapper>
 </mapper>