update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -782,5 +782,18 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     Integer findCourseNoStartNum(Long vipGroupId);
 
+    /**
+     * 已上课时数
+     * @param vipGroupId
+     * @return
+     */
     Integer findCourseEndNum(Long vipGroupId);
+
+    /**
+     * 统计vip课时数
+     * @param vipGroupId
+     * @param teachMode
+     * @return
+     */
+    Integer countCourseNum(@Param("vipGroupId") Long vipGroupId,@Param("teachMode") String teachMode);
 }

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

@@ -35,7 +35,7 @@ public class CourseScheduleRewardsRules {
 	private RewardMode rewardMode;
 
 	@ApiModelProperty(value = "分部列表（用逗号分开）", required = true)
-	private String organIdList;
+	private String organId;
 
 	@ApiModelProperty(value = "梯度奖励规则", required = true)
 	private String rewardsRulesJson;
@@ -80,12 +80,12 @@ public class CourseScheduleRewardsRules {
 		return this.rewardMode;
 	}
 
-	public void setOrganIdList(String organIdList) {
-		this.organIdList = organIdList;
+	public String getOrganId() {
+		return organId;
 	}
 
-	public String getOrganIdList() {
-		return this.organIdList;
+	public void setOrganId(String organId) {
+		this.organId = organId;
 	}
 
 	public void setRewardsRulesJson(String rewardsRulesJson) {

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

@@ -51,11 +51,11 @@ public class CourseScheduleRewardsRulesServiceImpl extends BaseServiceImpl<Integ
 			params.put("offset", pageInfo.getOffset());
 			dataList = this.getDAO().queryPage(params);
 			for (CourseScheduleRewardsRules rules : dataList) {
-				rules.setOrganNameList(organizationDao.findByOrganIds(rules.getOrganIdList()).stream().collect(Collectors.joining("、")));
+				rules.setOrganNameList(organizationDao.findByOrganIds(rules.getOrganId()).stream().collect(Collectors.joining("、")));
 			}
 		}
 		if (count == 0) {
-			dataList = new ArrayList<CourseScheduleRewardsRules>();
+			dataList = new ArrayList<>();
 		}
 		pageInfo.setRows(dataList);
 		return pageInfo;

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

@@ -608,6 +608,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		VipGroupManageDetailDto vipGroupBaseInfo = vipGroupDao.getVipGroupBaseInfo(vipGroupId);
 		vipGroupBaseInfo.setSubjectName(StringUtils.join(subjectDao.findBySubIds(vipGroupBaseInfo.getSubjectIdList()),","));
 		ClassGroupTeacherSalary byVipGoupAndTeacher = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupBaseInfo.getUserId());
+		Integer onlineNum = courseScheduleDao.countCourseNum(vipGroupId,"ONLINE");
+		Integer offlineNum = courseScheduleDao.countCourseNum(vipGroupId,"OFFLINE");
+		vipGroupBaseInfo.setOnlineClassesNum(onlineNum);
+		vipGroupBaseInfo.setOfflineClassesNum(offlineNum);
 		if(Objects.nonNull(byVipGoupAndTeacher)){
 			vipGroupBaseInfo.setOnlineTeacherSalary(byVipGoupAndTeacher.getOnlineClassesSalary());
 			vipGroupBaseInfo.setOfflineTeacherSalary(byVipGoupAndTeacher.getSalary());

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

@@ -1602,9 +1602,16 @@
         SELECT count(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_='VIP'
     </select>
     <select id="findCourseNoStartNum" resultType="java.lang.Integer">
-        SELECT COUNT(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_ = 'VIP' AND cs.status_ = 'NOT_START'
+        SELECT COUNT(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_ = 'VIP' AND cs.status_ = 'NOT_START' AND cs.del_flag_ != '1'
     </select>
     <select id="findCourseEndNum" resultType="java.lang.Integer">
-        SELECT COUNT(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_ = 'VIP' AND cs.status_ != 'NOT_START'
+        SELECT COUNT(cs.id_) FROM course_schedule cs WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_ = 'VIP' AND cs.status_ != 'NOT_START' AND cs.del_flag_ != '1'
+    </select>
+    <select id="countCourseNum" resultType="java.lang.Integer">
+        SELECT COUNT(cs.id_) FROM course_schedule cs
+        WHERE cs.music_group_id_ = #{vipGroupId} AND cs.group_type_ = 'VIP' AND cs.del_flag_ != '1'
+        <if test="teachMode != null">
+            AND cs.teach_mode_ = #{teachMode}
+        </if>
     </select>
 </mapper>

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

@@ -11,7 +11,7 @@
 			typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="reward_mode_" property="rewardMode"
 			typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="organ_id_list_" property="organIdList" />
+		<result column="organ_id_" property="organId" />
 		<result column="rewards_rules_json_" property="rewardsRulesJson" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -33,8 +33,9 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO course_schedule_rewards_rules
-		(id_,name_,course_schedule_type_,reward_mode_,organ_id_list_,rewards_rules_json_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{courseScheduleType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rewardMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{organIdList},#{rewardsRulesJson},now(),now())
+		(id_,name_,course_schedule_type_,reward_mode_,organ_id_,rewards_rules_json_,create_time_,update_time_)
+		VALUES(#{id},#{name},#{courseScheduleType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		#{rewardMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{organId},#{rewardsRulesJson},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -55,8 +56,8 @@
 			<if test="updateTime != null">
 				update_time_ = now(),
 			</if>
-			<if test="organIdList != null">
-				organ_id_list_ = #{organIdList},
+			<if test="organId != null">
+				organ_id_ = #{organId},
 			</if>
 			<if test="name != null">
 				name_ = #{name},
@@ -89,10 +90,10 @@
 	</select>
 	
 	<select id="query" resultType="map">
-		SELECT * FROM course_schedule_rewards_rules where find_in_set(#{organId},organ_id_list_) and course_schedule_type_ = #{courseScheduleType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} order by update_time_ desc
+		SELECT * FROM course_schedule_rewards_rules where find_in_set(#{organId},organ_id_) and course_schedule_type_ = #{courseScheduleType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} order by update_time_ desc
 	</select>
 	
 	<select id="queryOrganIdList" resultType="java.lang.String">
-		SELECT organ_id_list_ FROM course_schedule_rewards_rules
+		SELECT organ_id_ FROM course_schedule_rewards_rules
 	</select>
 </mapper>

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

@@ -51,7 +51,7 @@ public class CourseScheduleRewardsRulesController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('courseScheduleRewards/add')")
 	public Object add(CourseScheduleRewardsRules courseScheduleRewardsRules) {
 		List<Integer> organIdList = courseScheduleRewardsRulesService.queryOrganIdList();
-		String[] organIdArrays = courseScheduleRewardsRules.getOrganIdList().split(",");
+		String[] organIdArrays = courseScheduleRewardsRules.getOrganId().split(",");
 		for (String organId : organIdArrays) {
 			if (organIdList.contains(Integer.parseInt(organId))) {
 				return failed("所设分部存在异常");