Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsInformation.java

@@ -23,6 +23,10 @@ public class SysNewsInformation {
 	@ApiModelProperty(value = "封面图片", required = false)
 	private String coverImage;
 
+	/** 视频封面图片 */
+	@ApiModelProperty(value = "视频封面图片", required = false)
+	private String videoCoverImage;
+
 	/** 类型 */
 	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯,3banner类型", required = true)
 	private Integer type;
@@ -56,6 +60,10 @@ public class SysNewsInformation {
 
 	private Integer tenantId;
 
+	private String attribute1;
+	
+	private String attribute2;
+
 	public String getLinkUrl() {
 		return linkUrl;
 	}
@@ -112,6 +120,14 @@ public class SysNewsInformation {
 		return this.coverImage;
 	}
 
+	public String getVideoCoverImage() {
+		return videoCoverImage;
+	}
+
+	public void setVideoCoverImage(String videoCoverImage) {
+		this.videoCoverImage = videoCoverImage;
+	}
+
 	public void setType(Integer type) {
 		this.type = type;
 	}
@@ -176,6 +192,22 @@ public class SysNewsInformation {
 		this.subType = subType;
 	}
 
+	public String getAttribute1() {
+		return attribute1;
+	}
+
+	public void setAttribute1(String attribute1) {
+		this.attribute1 = attribute1;
+	}
+
+	public String getAttribute2() {
+		return attribute2;
+	}
+
+	public void setAttribute2(String attribute2) {
+		this.attribute2 = attribute2;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -11,6 +11,7 @@
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
 		<result column="cover_image_" property="coverImage" />
+		<result column="video_cover_image_" property="videoCoverImage" />
 		<result column="link_url_" property="linkUrl"/>
 		<result column="type_" property="type"/>
 		<result column="sub_type_" property="subType"/>
@@ -22,6 +23,8 @@
 		<result column="order_" property="order" />
 		<result column="memo_" property="memo" />
 		<result column="tenant_id_" property="tenantId" />
+		<result column="attribute1_" property="attribute1" />
+		<result column="attribute2_" property="attribute2" />
 	</resultMap>
 	
 	<sql id="queryCondition">
@@ -60,8 +63,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,sub_type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,memo_,tenant_id_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{subType},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{tenantId})
+		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,video_cover_image_,type_,sub_type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,memo_,tenant_id_,attribute1_,attribute2_)
+		VALUES(#{id},#{title},#{content},#{coverImage},#{videoCoverImage},#{type},#{subType},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{tenantId},#{attribute1},#{attribute2})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -86,6 +89,9 @@
 			<if test="coverImage != null">
 				cover_image_ = #{coverImage},
 			</if>
+			<if test="videoCoverImage != null">
+				video_cover_image_ = #{videoCoverImage},
+			</if>
 			<if test="type != null">
 				type_ = #{type},
 			</if>
@@ -107,6 +113,12 @@
 			<if test="delFlag != null">
 				del_flag_ = #{delFlag},
 			</if>
+			<if test="attribute1 != null">
+				attribute1_ = #{attribute1},
+			</if>
+			<if test="attribute2 != null">
+				attribute2_ = #{attribute2},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

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

@@ -1286,7 +1286,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("班级不存在");
         }
         Integer num = classGroupStudentMapperDao.countClassGroupStudentNum(classGroupId);
-        classGroup.setStudentNum(num - 1);
+        classGroup.setStudentNum(num);
         classGroup.setUpdateTime(new Date());
 
         classGroupDao.update(classGroup);