Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.CoursesGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -125,6 +126,15 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ImGroupModel> queryUserVipGroups(@Param("userId") Integer userId, @Param("search") String search);
 
     /**
+     * 获取学员所在对外群组信息
+     *
+     * @param userId
+     * @param search
+     * @return
+     */
+    List<ImGroupModel> queryUserCommGroups(@Param("userId") Integer userId, @Param("search") String search);
+
+    /**
      * 获取vip课的学生名称列表
      *
      * @param vipIds

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

@@ -75,8 +75,17 @@ public interface CourseScheduleEvaluateDao extends BaseDAO<Long, CourseScheduleE
 
     /**
      * 获取班级课程数
+     *
      * @param classGroupId
      * @return
      */
     Integer getClassGroupCourseTimes(@Param("classGroupId") Integer classGroupId);
+
+    /**
+     * 查询当天是否已有报告
+     * @param classGroupIds
+     * @param nowDate
+     * @return
+     */
+    List<CourseScheduleEvaluate> hasReportList(@Param("classGroupIds") List<Integer> classGroupIds, @Param("nowDate") Date nowDate);
 }

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

@@ -392,6 +392,19 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<BasicUserDto> findCloseCourseStudentIds(@Param("teacherId") Integer teacherId,@Param("search") String search);
 
     /**
+     * 获取相关vip教务的学员编号
+     * @param teacherId
+     * @return
+     */
+    List<BasicUserDto> findVipEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
+    /**
+     * 获取相关陪练教务的学员编号
+     * @param teacherId
+     * @return
+     */
+    List<BasicUserDto> findPracticeEducationalStudentId(@Param("teacherId") Integer teacherId,@Param("search") String search);
+
+    /**
      * 获取学员相关的陪练课教务老师
      * @param userId
      * @return

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivites;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface TenantEntryActivitesDao extends BaseDAO<Integer, TenantEntryActivites> {
+
+	
+}

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

@@ -0,0 +1,158 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(tenant_entry_activites):
+ */
+public class TenantEntryActivites {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private String name;
+	
+	/**  */
+	private String coverImg;
+	
+	/**  */
+	private String detail;
+	
+	/**  */
+	private java.math.BigDecimal totalPrice;
+	
+	/**  */
+	private java.math.BigDecimal discountPrice;
+	
+	/**  */
+	private Integer giveMinutes;
+	
+	/**  */
+	private java.util.Date startDate;
+	
+	/**  */
+	private java.util.Date endDate;
+	
+	/**  */
+	private String condition;
+	
+	/**  */
+	private boolean delFlag;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setCoverImg(String coverImg){
+		this.coverImg = coverImg;
+	}
+	
+	public String getCoverImg(){
+		return this.coverImg;
+	}
+			
+	public void setDetail(String detail){
+		this.detail = detail;
+	}
+	
+	public String getDetail(){
+		return this.detail;
+	}
+			
+	public void setTotalPrice(java.math.BigDecimal totalPrice){
+		this.totalPrice = totalPrice;
+	}
+	
+	public java.math.BigDecimal getTotalPrice(){
+		return this.totalPrice;
+	}
+			
+	public void setDiscountPrice(java.math.BigDecimal discountPrice){
+		this.discountPrice = discountPrice;
+	}
+	
+	public java.math.BigDecimal getDiscountPrice(){
+		return this.discountPrice;
+	}
+			
+	public void setGiveMinutes(Integer giveMinutes){
+		this.giveMinutes = giveMinutes;
+	}
+	
+	public Integer getGiveMinutes(){
+		return this.giveMinutes;
+	}
+			
+	public void setStartDate(java.util.Date startDate){
+		this.startDate = startDate;
+	}
+	
+	public java.util.Date getStartDate(){
+		return this.startDate;
+	}
+			
+	public void setEndDate(java.util.Date endDate){
+		this.endDate = endDate;
+	}
+	
+	public java.util.Date getEndDate(){
+		return this.endDate;
+	}
+			
+	public void setCondition(String condition){
+		this.condition = condition;
+	}
+	
+	public String getCondition(){
+		return this.condition;
+	}
+			
+	public void setDelFlag(boolean delFlag){
+		this.delFlag = delFlag;
+	}
+	
+	public boolean isDelFlag(){
+		return this.delFlag;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseReview4EduQueryInfo.java

@@ -17,6 +17,9 @@ public class CourseReview4EduQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否提价作业 1-提交 0未提交",required = false)
     private Integer hasHandHomework;
 
+    @ApiModelProperty(value = "是否完成双向沟通 1-是 0-否",required = false)
+    private Integer hasLiaison;
+
     @ApiModelProperty(value = "开始时间",required = false)
     private String startTime;
 
@@ -63,4 +66,12 @@ public class CourseReview4EduQueryInfo extends QueryInfo {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public Integer getHasLiaison() {
+        return hasLiaison;
+    }
+
+    public void setHasLiaison(Integer hasLiaison) {
+        this.hasLiaison = hasLiaison;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseReviewQueryInfo.java

@@ -32,6 +32,9 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否提价作业 1-提交 0未提交",required = false)
     private Integer hasHandHomework;
 
+    @ApiModelProperty(value = "是否完成双向沟通 1-是 0-否",required = false)
+    private Integer hasLiaison;
+
     @ApiModelProperty(value = "教务评价",required = false)
     private String courseReview;
 
@@ -130,4 +133,12 @@ public class CourseReviewQueryInfo extends QueryInfo {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public Integer getHasLiaison() {
+        return hasLiaison;
+    }
+
+    public void setHasLiaison(Integer hasLiaison) {
+        this.hasLiaison = hasLiaison;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantEntryActivitesQueryInfo.java

@@ -0,0 +1,32 @@
+package com.ym.mec.biz.dal.page;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class TenantEntryActivitesQueryInfo extends QueryInfo {
+
+	@ApiModelProperty(value = "开始时间", required = false)
+	private Date startDate;
+
+	private Boolean delFlag;
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
+}

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

@@ -0,0 +1,14 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivites;
+import com.ym.mec.common.service.BaseService;
+
+public interface TenantEntryActivitesService extends BaseService<Integer, TenantEntryActivites> {
+
+	/**
+	 * 合并对象
+	 * @param tenantEntryActivites
+	 * @return
+	 */
+	public boolean merge(TenantEntryActivites tenantEntryActivites);
+}

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

@@ -38,6 +38,9 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ym.mec.biz.dal.enums.GroupType.PRACTICE;
+import static com.ym.mec.biz.dal.enums.GroupType.VIP;
+
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> implements ClassGroupService {
 
@@ -52,6 +55,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupDao musicGroupDao;
     @Autowired
+    private PracticeGroupDao practiceGroupDao;
+    @Autowired
+    private CoursesGroupDao coursesGroupDao;
+    @Autowired
     private MusicGroupBuildLogDao musicGroupBuildLogDao;
     @Autowired
     private ClassGroupRelationService classGroupRelationService;
@@ -599,8 +606,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取学员的乐团列表详情
         List<CourseListDto> musicCourse = classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","), userId);
 
-        if(!CollectionUtils.isEmpty(typeGroupMap.get(GroupType.PRACTICE))){
-            musicGroupIds=typeGroupMap.get(GroupType.PRACTICE).stream().map(Group::getId).collect(Collectors.toList());
+        if(!CollectionUtils.isEmpty(typeGroupMap.get(PRACTICE))){
+            musicGroupIds=typeGroupMap.get(PRACTICE).stream().map(Group::getId).collect(Collectors.toList());
         }else{
             musicGroupIds=null;
         }
@@ -706,6 +713,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public List<ImGroupModel> queryUserGroups(Integer userId, String search) {
         List<ImGroupModel> imGroupModels = classGroupDao.queryUserMusicGroups(userId, search);
         imGroupModels.addAll(classGroupDao.queryUserVipGroups(userId, search));
+        imGroupModels.addAll(classGroupDao.queryUserCommGroups(userId, search));
         if (imGroupModels != null && imGroupModels.size() > 0) {
 //            Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
@@ -725,6 +733,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (students == null) {
             students = new ArrayList<>();
         }
+        ClassGroup classGroup = classGroupDao.get(groupId);
+        GroupType groupType = classGroup.getGroupType();
+        String musicGroupId = classGroup.getMusicGroupId();
         //获取当前群关联的乐团
         MusicGroup musicGroup = musicGroupDao.findByClassId(groupId);
         Set<Integer> teacherIds = new HashSet<>();
@@ -735,10 +746,27 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         //获取相关老师
         teacherIds.addAll(classGroupDao.findGroupTeacher(groupId));
-
+        //获取网管课课程教务老师
+        PracticeGroup practiceGroup = null;
+        VipGroup vipGroup = null;
+        switch (groupType){
+            case PRACTICE:
+                practiceGroup = practiceGroupDao.get(Long.parseLong(musicGroupId));
+                teacherIds.add(practiceGroup.getEducationalTeacherId());
+                break;
+            case COMM:
+//                CoursesGroup coursesGroup = coursesGroupDao.get(groupId.longValue());
+//                teacherIds.add(coursesGroup.getEducationalTeacherId());
+                break;
+            case VIP:
+                vipGroup = vipGroupDao.get(Long.parseLong(musicGroupId));
+                teacherIds.add(vipGroup.getEducationalTeacherId());
+                break;
+        }
+        teacherIds.removeAll(Collections.singleton(null));
         if(teacherIds.size() > 0){
             List<ImUserModel> userModels = teacherDao.queryTeacherImModel(teacherIds);
-            userModels.forEach(e->{
+            for (ImUserModel e : userModels) {
                 if(musicGroup != null){
                     if(musicGroup.getTeamTeacherId() != null && Integer.parseInt(e.getId()) == musicGroup.getTeamTeacherId()){
                         e.setTitle("运营主管");
@@ -749,10 +777,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
                         e.setTitle("指导老师");
                     }
-                }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
-                    e.setTitle("指导老师");
+                }else{
+                    if(groupType == PRACTICE && practiceGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == practiceGroup.getEducationalTeacherId()){
+                        e.setTitle("教务老师");
+                    }else if(groupType == VIP && vipGroup.getEducationalTeacherId() != null &&  Integer.parseInt(e.getId()) == vipGroup.getEducationalTeacherId()){
+                        e.setTitle("教务老师");
+                    }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
+                        e.setTitle("指导老师");
+                    }
                 }
-            });
+            };
             students.addAll(userModels);
         }
         return students;

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

@@ -135,26 +135,40 @@ public class CourseScheduleEvaluateServiceImpl extends BaseServiceImpl<Long, Cou
         List<CourseScheduleEvaluate> needPostReportPracticeGroups = practiceGroupDao.getNeedPostReportPracticeGroups(startDate, afterDate,afterDateIsLastDay);
 
         Map<Integer, Integer> courseTimesMap = new HashMap<>();
+        Map<Integer, Integer> reportCountMap = new HashMap<>();
         if (needPostReportPracticeGroups.size() > 0) {
             Date courseStartDate = DateUtil.addMonths(startDate, -1);
             List<Integer> classGroupIds = needPostReportPracticeGroups.stream().map(CourseScheduleEvaluate::getClassGroupId).collect(Collectors.toList());
             List<ClassGroup> reportCourseTimes = practiceGroupDao.getReportCourseTimes(classGroupIds, courseStartDate, startDate);
             courseTimesMap = reportCourseTimes.stream().collect(Collectors.toMap(ClassGroup::getId, ClassGroup::getTotalClassTimes));
+
+            List<CourseScheduleEvaluate> courseScheduleEvaluates = courseScheduleEvaluateDao.hasReportList(classGroupIds, startDate);
+            if(courseScheduleEvaluates.size() > 0){
+                reportCountMap = courseScheduleEvaluates.stream().collect(Collectors.toMap(CourseScheduleEvaluate::getClassGroupId,CourseScheduleEvaluate::getTimes));
+            }
         }
-        for (CourseScheduleEvaluate needPostReportPracticeGroup : needPostReportPracticeGroups) {
+        Iterator<CourseScheduleEvaluate> iterator = needPostReportPracticeGroups.iterator();
+        while (iterator.hasNext()){
+            CourseScheduleEvaluate courseScheduleEvaluate = iterator.next();
+            if(reportCountMap.containsKey(courseScheduleEvaluate.getClassGroupId()) &&
+                    reportCountMap.get(courseScheduleEvaluate.getClassGroupId()) > 0){
+                iterator.remove();
+                continue;
+            }
             int times = 0;
-            if (courseTimesMap.containsKey(needPostReportPracticeGroup.getClassGroupId()) &&
-                    courseTimesMap.get(needPostReportPracticeGroup.getClassGroupId()) != null
+            if (courseTimesMap.containsKey(courseScheduleEvaluate.getClassGroupId()) &&
+                    courseTimesMap.get(courseScheduleEvaluate.getClassGroupId()) != null
             ) {
-                times = courseTimesMap.get(needPostReportPracticeGroup.getClassGroupId());
+                times = courseTimesMap.get(courseScheduleEvaluate.getClassGroupId());
             }
-            needPostReportPracticeGroup.setTimes(times);
-            needPostReportPracticeGroup.setTotalMinutes(times * needPostReportPracticeGroup.getTotalMinutes());
-            needPostReportPracticeGroup.setCreateTime(nowDate);
-            needPostReportPracticeGroup.setUpdateTime(nowDate);
-            needPostReportPracticeGroup.setStatus(0);
-            needPostReportPracticeGroup.setVersion(2);
+            courseScheduleEvaluate.setTimes(times);
+            courseScheduleEvaluate.setTotalMinutes(times * courseScheduleEvaluate.getTotalMinutes());
+            courseScheduleEvaluate.setCreateTime(nowDate);
+            courseScheduleEvaluate.setUpdateTime(nowDate);
+            courseScheduleEvaluate.setStatus(0);
+            courseScheduleEvaluate.setVersion(2);
         }
+
         if (needPostReportPracticeGroups.size() > 0) {
             courseScheduleEvaluateDao.batchAdd(needPostReportPracticeGroups);
         }

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

@@ -1108,9 +1108,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //获取陪练课,vip课代课老师关联
         teacherIds.addAll(teacherDao.findCloseCourseTeacherIds(studentId));
         //获取陪练课课程教务老师
-//        teacherIds.addAll(teacherDao.findPracticeEducationalTeacherId(studentId));
+        teacherIds.addAll(teacherDao.findPracticeEducationalTeacherId(studentId));
         //获取VIP课程教务老师
-//        teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
+        teacherIds.addAll(teacherDao.findVipEducationalTeacherId(studentId));
         if(teacherIds.size() > 0){
         	return teacherDao.queryTeacherBaseInfo(teacherIds,search);
         }

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

@@ -189,6 +189,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		}
 		//获取课程关联的学生列表
 		teachers.addAll(teacherDao.findCloseCourseStudentIds(teacherId, search));
+		//获取相关vip陪练教务的学员编号
+		teachers.addAll(teacherDao.findVipEducationalStudentId(teacherId,search));
+		teachers.addAll(teacherDao.findPracticeEducationalStudentId(teacherId,search));
+
 		return teachers.stream().distinct().collect(Collectors.toList());
 	}
 
@@ -360,11 +364,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public List<BasicUserDto> queryEducationIpa(Integer userId, String search) {
-		List<BasicUserDto> basicUserDtos = queryGroupStudents(userId, search);
+//		List<BasicUserDto> basicUserDtos = queryGroupStudents(userId, search);
 		//获取当前管理人员所在分部，所有老师，以及没有乐团的学生
-		List<BasicUserDto> userDtos = teacherDao.queryEducationIpa(userId, search);
-		userDtos.addAll(basicUserDtos);
-		return userDtos.stream().distinct().collect(Collectors.toList());
+//		List<BasicUserDto> userDtos = teacherDao.queryEducationIpa(userId, search);
+//		userDtos.addAll(basicUserDtos);
+//		return userDtos.stream().distinct().collect(Collectors.toList());
+		return queryGroupStudents(userId, search);
 	}
 
 	@Override

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

@@ -0,0 +1,51 @@
+package com.ym.mec.biz.service.impl;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.TenantEntryActivitesDao;
+import com.ym.mec.biz.dal.entity.TenantEntryActivites;
+import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class TenantEntryActivitesServiceImpl extends BaseServiceImpl<Integer, TenantEntryActivites> implements TenantEntryActivitesService {
+
+	@Autowired
+	private TenantEntryActivitesDao tenantEntryActivitesDao;
+
+	@Override
+	public BaseDAO<Integer, TenantEntryActivites> getDAO() {
+		return tenantEntryActivitesDao;
+	}
+
+	@Override
+	public boolean merge(TenantEntryActivites tenantEntryActivites) {
+
+		if (!tenantEntryActivites.getStartDate().before(tenantEntryActivites.getEndDate())) {
+			throw new BizException("活动开始时间必须在结束时间之前");
+		}
+
+		Date date = new Date();
+		if (tenantEntryActivites.getId() != null) {
+			TenantEntryActivites orginTenantEntryActivites = tenantEntryActivitesDao.get(tenantEntryActivites.getId());
+
+			if (orginTenantEntryActivites == null) {
+				throw new BizException("操作失败，请检查输入参数");
+			}
+			tenantEntryActivites.setCreateTime(orginTenantEntryActivites.getCreateTime());
+			tenantEntryActivites.setUpdateTime(date);
+			tenantEntryActivitesDao.update(tenantEntryActivites);
+		} else {
+			tenantEntryActivites.setCreateTime(date);
+			tenantEntryActivites.setUpdateTime(date);
+			tenantEntryActivitesDao.insert(tenantEntryActivites);
+		}
+		return true;
+	}
+
+}

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

@@ -271,10 +271,9 @@
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_
         FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
-        LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
         <where>
-            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2)
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND mg.status_ = 'PROGRESS' AND cgsm.group_type_ = 'MUSIC'
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>
@@ -291,7 +290,23 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_
         <where>
-            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND vg.group_status_ = 4
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND vg.group_status_ = 4 AND cgsm.group_type_ = 'VIP'
+            <if test="userId != null">
+                AND cgsm.user_id_ = #{userId}
+            </if>
+            <if test="search != null and search != ''">
+                AND cg.name_ LIKE CONCAT('%',#{search},'%')
+            </if>
+        </where>
+        GROUP BY cg.id_
+    </select>
+    <select id="queryUserCommGroups" resultMap="imGroupModel">
+        SELECT cg.id_,cg.name_,cg.student_num_,cg.img_
+        FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        LEFT JOIN courses_group vg ON vg.id_ = cg.music_group_id_
+        <where>
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND vg.status_ = 'NORMAL' AND cgsm.group_type_ = 'COMM'
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>

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

@@ -233,4 +233,13 @@
     <select id="getClassGroupCourseTimes" resultType="int">
         SELECT COUNT(*) FROM course_schedule WHERE class_group_id_ = #{classGroupId} AND (del_flag_=0 OR del_flag_ IS NULL)
     </select>
+
+    <select id="hasReportList" resultMap="CourseScheduleEvaluate">
+        SELECT COUNT(*) times_, class_group_id_ FROM course_schedule_evaluate WHERE class_group_id_ IN
+        <foreach collection="classGroupIds" item="classGroupId" open="(" separator="," close=")">
+            #{classGroupId}
+        </foreach>
+        AND DATE_FORMAT(create_time_,'%Y%m%d') = DATE_FORMAT(#{nowDate},'%Y%m%d')
+        GROUP BY class_group_id_;
+    </select>
 </mapper>

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

@@ -160,6 +160,12 @@
             <if test='hasHandHomework !=null and hasHandHomework=="0"'>
                 AND csr.hand_homework_ IS NULL
             </if>
+            <if test='hasLiaison !=null and hasLiaison=="1"'>
+                AND csr.has_liaison_ = 1
+            </if>
+            <if test='hasLiaison !=null and hasLiaison=="0"'>
+                AND (csr.has_liaison_ = 0 OR csr.has_liaison_ IS NULL
+            </if>
             <if test="courseReview != null">
                 AND csr.course_review_=#{courseReview}
             </if>
@@ -208,6 +214,12 @@
             <if test='hasHandHomework !=null and hasHandHomework=="0"'>
                 AND csr.hand_homework_ IS NULL
             </if>
+            <if test='hasLiaison !=null and hasLiaison=="1"'>
+                AND csr.has_liaison_ = 1
+            </if>
+            <if test='hasLiaison !=null and hasLiaison=="0"'>
+                AND csr.has_liaison_ = 0
+            </if>
             <if test="startTime !=null">
                 <![CDATA[AND cs.class_date_ >= #{startTime} ]]>
             </if>

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

@@ -307,18 +307,17 @@
 		select sum(case when dgcp.status_ = 0 then 1 else 0 end) unbooked_num_,
 		sum(case when dgcp.status_ = 1 then 1 else 0 end) booked_num_
 		from demo_group_courses_plan dgcp left join demo_group dg on dgcp.demo_group_id_ = dg.id_
-		<where>
-            <if test="organIds != null">
-                AND INTE_ARRAY(dg.organ_id_list_,#{organIds})
-            </if>
-    	</where> 
+		where INTE_ARRAY(dg.organ_id_list_,'36,38') = 0
+        <if test="organIds != null">
+            AND INTE_ARRAY(dg.organ_id_list_,#{organIds})
+        </if>
 	</select>
     
     <select id="queryCurrentMonthCoursesNum" resultType="int">
     	select count(cs.id_) from course_schedule cs
         left join demo_group vg on cs.music_group_id_ = vg.id_
         where cs.type_ = 'DEMO'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and INTE_ARRAY(vg.organ_id_list_,'36,38') = 0
         <if test="organIds != null">
             AND INTE_ARRAY(vg.organ_id_list_,#{organIds})
         </if>

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

@@ -304,11 +304,10 @@
     
   	<select id="queryOrganMusicGroupNum" resultType="map">
     	select count(*) total,sum(case when status_ = 'PREPARE' then 1 else 0 end) prepare_num_,sum(case when status_ = 'PROGRESS' then 1 else 0 end) progress_num_,sum(case when status_ = 'PAUSE' then 1 else 0 end) pause_num_ from music_group
-    	<where>
-    		<if test="organId != null">
-    			FIND_IN_SET(organ_id_,#{organId})
-    		</if>
-    	</where>
+   		where organ_id_ not in (36,38)
+   		<if test="organId != null">
+   			and FIND_IN_SET(organ_id_,#{organId})
+   		</if>
   	</select>
   	
   	<select id="queryCurrentMonthCoursesNum" resultType="int">
@@ -316,7 +315,7 @@
 		left join class_group cg on cs.class_group_id_ = cg.id_
 		left join music_group mg on cg.music_group_id_ = mg.id_
 		where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and mg.organ_id_ not in (36,38)
    		<if test="organId != null">
    			AND FIND_IN_SET(mg.organ_id_,#{organId})
    		</if>

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

@@ -522,7 +522,7 @@
     <select id="queryIncomeStatisticsWithCurrentMonth" resultType="map">
         select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
         where actual_amount_ &gt; 0 and DATE_FORMAT(create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) AND
-        status_ = 'SUCCESS'
+        status_ = 'SUCCESS' and organ_id_ not in (36,38)
         <if test="organId != null">
             and FIND_IN_SET(organ_id_,#{organId})
         </if>

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

@@ -502,11 +502,10 @@
     <select id="queryStudentNum" resultType="map">
         SELECT count(distinct sr.user_id_) total_num_,sum(case when sr.create_time_ >= timestamp(date_add(curdate(), interval - day(curdate()) + 1 day)) then 1 else 0 end) new_num_,sum(case when sr.music_group_status_ = 'QUIT' and sr.update_time_ >= timestamp(date_add(curdate(), interval - day(curdate()) + 1 day)) then 1 else 0 end) quit_num_
         FROM student_registration sr left join music_group mg on sr.music_group_id_ = mg.id_
-        <where>
-    		<if test="organId != null">
-    			AND FIND_IN_SET(mg.organ_id_,#{organId})
-    		</if>
-    	</where>
+        where mg.organ_id_ not in (36,38)
+   		<if test="organId != null">
+   			AND FIND_IN_SET(mg.organ_id_,#{organId})
+   		</if>
     </select>
     <select id="findMapByMusicGroupId" resultType="java.util.Map">
         SELECT sr.user_id_ 'key',MIN(sr.parents_phone_) 'value' FROM student_registration sr

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

@@ -194,7 +194,7 @@
         sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then sucad.amount_ else 0 end) expend_total_ from
         sys_user_cash_account_detail sucad
         left join sys_user u on sucad.user_id_ = u.id_
-        where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
+        where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) and u.organ_id_ not in (36,38)
         <if test="organId != null">
             AND FIND_IN_SET(u.organ_id_,#{organId})
         </if>

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

@@ -662,7 +662,7 @@
     <select id="queryOrganTeacherNum" resultType="map">
         select count(*) total,sum(case when job_nature_ = 'PART_TIME' then 1 else 0 end) part_time_num_,sum(case when
         job_nature_ = 'FULL_TIME' then 1 else 0 end) full_time_num_ from teacher
-        where demission_date_ is null
+        where demission_date_ is null and organ_id_ not in (36,38)
             <if test="organId != null">
                 and FIND_IN_SET(organ_id_,#{organId})
             </if>
@@ -898,6 +898,23 @@
         </if>
         GROUP BY su.id_
     </select>
+
+    <select id="findVipEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
+        FROM vip_group vg
+        LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+        LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+        WHERE cssp.group_type_ = 'VIP' AND vg.educational_teacher_id_ = #{teacherId}
+        GROUP BY su.id_
+    </select>
+    <select id="findPracticeEducationalStudentId" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,NULL subject_name_,su.user_type_
+        FROM practice_group pg
+        LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = pg.id_
+        LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+        WHERE cssp.group_type_ = 'PRACTICE' AND pg.educational_teacher_id_ = #{teacherId}
+        GROUP BY su.id_
+    </select>
     <select id="findPracticeEducationalTeacherId" resultType="java.lang.Integer">
         SELECT DISTINCT pg.educational_teacher_id_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group_teacher_mapper cgtm ON cgsm.class_group_id_ = cgtm.class_group_id_

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.biz.dal.dao.TenantEntryActivitesDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.TenantEntryActivites"
+		id="TenantEntryActivites">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="cover_img_" property="coverImg" />
+		<result column="detail_" property="detail" />
+		<result column="total_price_" property="totalPrice" />
+		<result column="discount_price_" property="discountPrice" />
+		<result column="give_minutes_" property="giveMinutes" />
+		<result column="start_date_" property="startDate" />
+		<result column="end_date_" property="endDate" />
+		<result column="condition_" property="condition" />
+		<result column="del_flag_" property="delFlag" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<sql id="queryCondition">
+		<where>
+			<if test="startDate != null">
+				and (start_date_ &gt;= #{startDate} and end_date_ &lt;= #{startDate})
+			</if>
+			<if test="delFlag != null">
+				and del_flag_ = #{delFlag}
+			</if>
+		</where>
+	</sql>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="TenantEntryActivites">
+		SELECT * FROM tenant_entry_activites WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="TenantEntryActivites">
+		SELECT * FROM
+		tenant_entry_activites ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivites"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO tenant_entry_activites
+		(id_,name_,cover_img_,detail_,total_price_,discount_price_,give_minutes_,start_date_,end_date_,condition_,del_flag_,create_time_,update_time_)
+		VALUES(#{id},#{name},#{coverImg},#{detail},#{totalPrice},#{discountPrice},#{giveMinutes},#{startDate},#{endDate},#{condition},#{delFlag},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.TenantEntryActivites">
+		UPDATE tenant_entry_activites
+		<set>
+			<if test="condition != null">
+				condition_ = #{condition},
+			</if>
+			<if test="delFlag != null">
+				del_flag_ = #{delFlag},
+			</if>
+			<if test="startDate != null">
+				start_date_ = #{startDate},
+			</if>
+			<if test="coverImg != null">
+				cover_img_ = #{coverImg},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="giveMinutes != null">
+				give_minutes_ = #{giveMinutes},
+			</if>
+			<if test="name != null">
+				name_ = #{name},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+			<if test="totalPrice != null">
+				total_price_ = #{totalPrice},
+			</if>
+			<if test="detail != null">
+				detail_ = #{detail},
+			</if>
+			<if test="endDate != null">
+				end_date_ = #{endDate},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="discountPrice != null">
+				discount_price_ = #{discountPrice},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM tenant_entry_activites WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="TenantEntryActivites"
+		parameterType="map">
+		SELECT * FROM tenant_entry_activites
+		<include refid="queryCondition" />
+		order by id_ desc
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM tenant_entry_activites
+		<include refid="queryCondition" />
+		order by id_ desc
+	</select>
+</mapper>

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

@@ -741,16 +741,15 @@
     
     <select id="queryVipGroupNum" resultType="map">
     	select count(*) total,sum(case when group_status_ = 2 then 1 else 0 end) applying_num_,sum(case when group_status_ = 4 then 1 else 0 end) finished_num_ from vip_group
-    	<where>
-    		<if test="organId != null">
-                FIND_IN_SET(organ_id_,#{organId})
-    		</if>
-    	</where>
+    	where organ_id_ not in (36,38)
+   		<if test="organId != null">
+              and FIND_IN_SET(organ_id_,#{organId})
+   		</if>
     </select>
     
     <select id="queryCurrentMonthCoursesNum" resultType="int">
     	select count(cs.id_) from course_schedule cs left join vip_group vg on cs.music_group_id_ = vg.id_ where cs.type_ in ('VIP')
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null)
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and  vg.organ_id_ not in (36,38)
    		<if test="organId != null">
    		    AND FIND_IN_SET(vg.organ_id_,#{organId})
    		</if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantEntryActivitesController.java

@@ -0,0 +1,33 @@
+package com.ym.mec.teacher.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.page.TenantEntryActivitesQueryInfo;
+import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("tenantEntryActivites")
+@Api(tags = "租客入驻活动")
+@RestController
+public class TenantEntryActivitesController extends BaseController {
+
+    @Autowired
+    private TenantEntryActivitesService tenantEntryActivitesService;
+
+    @ApiOperation(value = "分页查询活动列表")
+    @GetMapping("/queryPage")
+    public Object queryPage(TenantEntryActivitesQueryInfo queryInfo) {
+    	queryInfo.setDelFlag(false);
+    	queryInfo.setStartDate(new Date());
+        return succeed(tenantEntryActivitesService.queryPage(queryInfo));
+    }
+
+}

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

@@ -0,0 +1,49 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.TenantEntryActivites;
+import com.ym.mec.biz.service.TenantEntryActivitesService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+
+@RequestMapping("tenantEntryActivites")
+@Api(tags = "租客入驻活动")
+@RestController
+public class TenantEntryActivitesController extends BaseController {
+
+	@Autowired
+	private TenantEntryActivitesService tenantEntryActivitesService;
+
+	@ApiOperation(value = "分页查询活动列表")
+	@GetMapping("/queryPage")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/queryPage')")
+	public Object queryPage(QueryInfo queryInfo) {
+		return succeed(tenantEntryActivitesService.queryPage(queryInfo));
+	}
+
+	@ApiOperation(value = "查询活动信息")
+	@GetMapping("/query")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/query')")
+	public Object query(Integer id) {
+		return succeed(tenantEntryActivitesService.get(id));
+	}
+
+	@ApiOperation(value = "新增、修改活动")
+	@PostMapping("/merge")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivites/merge')")
+	public Object merge(@RequestBody TenantEntryActivites tenantEntryActivites) {
+		tenantEntryActivitesService.merge(tenantEntryActivites);
+		return succeed();
+	}
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduCourseReviewController.java

@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @RequestMapping("eduCourseReview")
-@Api(tags = "课程评价")
+@Api(tags = "教务端课程评价")
 @RestController
 public class EduCourseReviewController extends BaseController {