add:乐团删除

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

@@ -151,6 +151,8 @@ public class MusicGroup {
 	private OwnershipType ownershipType;
 	
 	private FeeType feeType;
+	
+	private Boolean delFlag;
 
 	private String subjectName;
 
@@ -490,6 +492,14 @@ public class MusicGroup {
 		this.feeType = feeType;
 	}
 
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -76,6 +76,13 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param musicGroupId 乐团编号
 	 */
 	boolean cancelMusicGroup(String musicGroupId);
+	
+	/**
+	 * 删除乐团
+	 * @param musicGroupId 乐团编号
+	 * @return
+	 */
+	boolean deleteMusicGroup(String musicGroupId);
 
 	/**
 	 * 暂停乐团

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

@@ -25,6 +25,7 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1256,6 +1257,30 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+	public boolean deleteMusicGroup(String musicGroupId) {
+
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        
+        if(musicGroup == null){
+        	throw new BizException("乐团不存在");
+        }
+        
+        if(musicGroup.getDelFlag() == true){
+        	throw new BizException("乐团已删除");
+        }
+        
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.CANCELED) {
+            throw new BizException("乐团当前状态是{}，不能删除", musicGroup.getStatus().getMsg());
+        }
+        
+        musicGroup.setUpdateTime(new Date());
+        musicGroup.setDelFlag(true);
+        musicGroupDao.update(musicGroup);
+        
+		return true;
+	}
+
+	@Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public boolean pauseMusicGroup(String musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();

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

@@ -35,6 +35,7 @@
         <result column="ownership_type_" property="ownershipType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="fee_type_" property="feeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -67,7 +68,7 @@
          bill_start_date_, improvent_classes_num_, enroll_classes_, payment_expire_date_, is_extra_class_,
          settlement_type_, cooperation_organ_id_, enlightenment_course_time_,
          parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
-         ownership_type_, repair_user_id_, fee_type_)
+         ownership_type_, repair_user_id_, fee_type_,del_flag)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{teamTeacherId}, #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
                 #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{billStartDate},
@@ -77,7 +78,7 @@
                 #{cooperationOrganId}, #{enlightenmentCourseTime}, #{parentMeetingTime}, #{img}, #{directorUserId},
                 #{isClassroomLessons}, #{memo}, #{expectStartGroupDate},
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
-                #{feeType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+                #{feeType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{delFlag})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -163,6 +164,9 @@
             <if test="memo != null">
                 memo_ = #{memo},
             </if>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -183,6 +187,7 @@
 
     <sql id="musicGroupQueryPageSql">
         <where>
+        	del_flag_ = 0
             <if test="organId != null">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>

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

@@ -222,6 +222,15 @@ public class MusicGroupController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "删除乐团")
+	@PostMapping("/deleteMusicGroup")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/deleteMusicGroup')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })
+	public Object deleteMusicGroup(String musicGroupId) {
+		musicGroupService.deleteMusicGroup(musicGroupId);
+		return succeed();
+	}
+
 	@ApiOperation(value = "暂停乐团")
 	@PostMapping("/pauseMusicGroup")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/pauseMusicGroup')")