update

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

@@ -44,6 +44,10 @@ public class ClassGroup {
 	@ApiModelProperty(value = "群名称", required = true)
 	private String groupName;
 
+	/** 群名称 */
+	@ApiModelProperty(value = "乐团名称", required = true)
+	private String musicGroupName;
+
 	/** 子班级名称列表 */
 	@ApiModelProperty(value = "子班班级名称")
 	private String classNames;
@@ -79,6 +83,14 @@ public class ClassGroup {
 	@ApiModelProperty(value = "班级图标",required = false)
 	private String img;
 
+	public String getMusicGroupName() {
+		return musicGroupName;
+	}
+
+	public void setMusicGroupName(String musicGroupName) {
+		this.musicGroupName = musicGroupName;
+	}
+
 	public String getGroupName() {
 		return groupName;
 	}

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

@@ -22,13 +22,13 @@ public class ImGroupNotice {
 
 	private String avatar;
 
-	private YesOrNoEnum isTop;
+	private Integer isTop;
 
 	private Date createTime;
 
 	private Date updateTime;
 
-	private YesOrNoEnum delFlag = YesOrNoEnum.NO;
+	private Integer delFlag = 0;
 
 	public String getRealName() {
 		return realName;
@@ -86,14 +86,6 @@ public class ImGroupNotice {
 		this.content = content;
 	}
 
-	public YesOrNoEnum getIsTop() {
-		return isTop;
-	}
-
-	public void setIsTop(YesOrNoEnum isTop) {
-		this.isTop = isTop;
-	}
-
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -110,11 +102,19 @@ public class ImGroupNotice {
 		this.updateTime = updateTime;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public Integer getIsTop() {
+		return isTop;
+	}
+
+	public void setIsTop(Integer isTop) {
+		this.isTop = isTop;
+	}
+
+	public Integer getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(Integer delFlag) {
 		this.delFlag = delFlag;
 	}
 }

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

@@ -2618,6 +2618,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if(classGroup.getGroupType() == GroupType.MUSIC){
                 MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                 if(musicGroup != null){
+                    classGroup.setMusicGroupName(musicGroup.getName());
                     classGroup.setName(musicGroup.getName() + " " + (StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName()));
                 }
             }

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

@@ -13,8 +13,8 @@
         <result column="content_" property="content"/>
         <result column="real_name_" property="realName"/>
         <result column="avatar_" property="avatar"/>
-        <result column="is_top_" property="isTop" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="is_top_" property="isTop"/>
+        <result column="del_flag_" property="delFlag"/>
         <result column="create_time_" property="createTime"/>
         <result column="operator_id_" property="operatorId"/>
         <result column="update_time_" property="updateTime"/>
@@ -35,8 +35,8 @@
             keyProperty="id">
         INSERT INTO im_group_notice (im_group_id_,title_,content_,is_top_,
         del_flag_,create_time_,update_time_,operator_id_)
-        VALUES(#{imGroupId},#{title},#{content},#{isTop, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{operatorId})
+        VALUES(#{imGroupId},#{title},#{content},#{isTop},
+        #{delFlag},now(),now(),#{operatorId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -44,7 +44,7 @@
         UPDATE im_group_notice
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                del_flag_ = #{delFlag},
             </if>
             <if test="title != null">
                 title_ = #{title},
@@ -53,7 +53,7 @@
                 content_ = content,
             </if>
             <if test="isTop != null">
-                is_top_ = #{isTop, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                is_top_ = #{isTop},
             </if>
             <if test="updateTime != null">
                 update_time_ = NOW()