Merge remote-tracking branch 'origin/master'

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

@@ -17,6 +17,8 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="href_target_" property="hrefTarget" />
+		<result column="order_" property="order" />
 	</resultMap>
 	
 	<sql id="queryCondition">
@@ -49,8 +51,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_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0)
+		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,href_target_,order_)
+		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{hrefTarget},#{order})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -100,7 +102,7 @@
 	<select id="queryPage" resultMap="SysNewsInformation" parameterType="map">
 		SELECT * FROM sys_news_information
 		<include refid="queryCondition" />
-		<include refid="global.orderby" />
+		order by order_ desc,update_time_ desc
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -33,7 +33,7 @@ public class CourseHomeworkListDto {
     private java.util.Date startClassTime;
 
     /**  */
-    private Integer musicGroupId;
+    private String musicGroupId;
 
     @ApiModelProperty(value = "乐团名称",required = false)
     private String musicGroupName;
@@ -110,11 +110,11 @@ public class CourseHomeworkListDto {
         this.startClassTime = startClassTime;
     }
 
-    public Integer getMusicGroupId() {
+    public String getMusicGroupId() {
         return musicGroupId;
     }
 
-    public void setMusicGroupId(Integer musicGroupId) {
+    public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
 

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

@@ -11,6 +11,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentChannelTypeEnum;
+import org.springframework.data.annotation.Version;
 
 /**
  * 对应数据库表(student_payment_order):
@@ -78,6 +79,7 @@ public class StudentPaymentOrder {
 	@ApiModelProperty(value = "课程组编号",required = true)
 	private Integer classGroupId;
 
+	@Version
 	private Integer version;
 
 	private Date payTime;

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

@@ -163,6 +163,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			message.setTitle(messageConfig.getDescription());
 			message.setReadStatus(0);
 			message.setMemo(memo);
+			message.setGroup(messageConfig.getGroup());
 			messages.add(message);
 		}
 		sysMessageDao.batchInsert(messages);

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

@@ -158,7 +158,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			//获取班级老师总数map
 			Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))),HashMap.class);
 			imGroupModels.forEach(e -> {
-				Integer num = numsMap.get(e.getId());
+				Integer num = numsMap.get(Integer.parseInt(e.getId()));
 				e.setCount((num == null ? 0 : num) + e.getCount());
 			});
 		}

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

@@ -328,11 +328,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(auditStatus==AuditStatusEnum.REJECT&&StringUtils.isBlank(reason)){
 			throw new BizException("请填写拒绝原因");
 		}
-		if(vipGroup.getAuditStatus() == AuditStatusEnum.PASS){
+		/*if(vipGroup.getAuditStatus() == AuditStatusEnum.PASS){
 			ImGroupMember[] imGroupMembers = new ImGroupMember[]{new ImGroupMember(vipGroup.getUserId().toString())};
 			// 创建群组
 			imFeignService.groupCreate(new ImGroupModel(vipGroupId.toString(), imGroupMembers, vipGroup.getName()));
-		}
+		}*/
 		vipGroup.setAuditStatus(auditStatus);
 		vipGroup.setStopReason(reason);
 		vipGroupDao.update(vipGroup);

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

@@ -461,7 +461,7 @@
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
         </if>
-        AND csts.user_id_ = #{teacherId}
+        AND csts.user_id_ = #{teacherId} AND cg.del_flag_ = 0
     </select>
 
     <select id="getCourseScheduleDateByMonth" resultType="java.util.Date">

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

@@ -240,7 +240,7 @@
         SELECT
         cs.class_date_ classDate,
         GROUP_CONCAT(DISTINCT CONCAT(cs.start_class_time_,' ',cs.end_class_time_)) startTimes,
-        GROUP_CONCAT(s.name_) subjectNames
+        GROUP_CONCAT(DISTINCT s.name_) subjectNames
         FROM
         demo_group dg
         LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_