Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 
 import java.util.Date;
@@ -36,6 +37,16 @@ public class CourseGroupTeacherCardDto {
 
     private String studentNames;
 
+    private GroupStatusEnum groupStatus;
+
+    public GroupStatusEnum getGroupStatus() {
+        return groupStatus;
+    }
+
+    public void setGroupStatus(GroupStatusEnum groupStatus) {
+        this.groupStatus = groupStatus;
+    }
+
     public Integer getClassGroupId() {
         return classGroupId;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.page.QueryInfo;
 
@@ -12,6 +13,15 @@ public class GroupCourseScheduleQueryInfo extends QueryInfo {
     private Integer teacherId;
     private String groupId;
     private GroupType groupType;
+    private GroupStatusEnum groupStatus;
+
+    public GroupStatusEnum getGroupStatus() {
+        return groupStatus;
+    }
+
+    public void setGroupStatus(GroupStatusEnum groupStatus) {
+        this.groupStatus = groupStatus;
+    }
 
     public Integer getTeacherId() {
         return teacherId;

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

@@ -4,9 +4,9 @@ import com.ym.mec.biz.dal.dto.CourseGroupCreateDto;
 import com.ym.mec.biz.dal.dto.GroupHeadInfoDto;
 import com.ym.mec.biz.dal.entity.CoursesGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.page.GroupCourseScheduleQueryInfo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.Map;
@@ -29,7 +29,7 @@ public interface CoursesGroupService extends BaseService<Long, CoursesGroup> {
      * @param teacherId: 教师编号
      * @return java.util.List<com.ym.mec.biz.dal.dto.CourseGroupTeacherCardDto>
      */
-    PageInfo findTeacherCourseGroups(Integer teacherId, QueryInfo queryInfo);
+    PageInfo findTeacherCourseGroups(Integer teacherId, GroupCourseScheduleQueryInfo queryInfo);
 
     /**
      * @describe 获取课程对应班级头部信息

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.biz.dal.page.GroupCourseScheduleQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.controller.BaseController;
@@ -15,7 +16,6 @@ import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
@@ -221,7 +221,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
     }
 
     @Override
-    public PageInfo findTeacherCourseGroups(Integer teacherId, QueryInfo queryInfo) {
+    public PageInfo findTeacherCourseGroups(Integer teacherId, GroupCourseScheduleQueryInfo queryInfo) {
         if(Objects.isNull(teacherId)){
             throw new BizException("请指定老师");
         }
@@ -261,11 +261,14 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                 groupCard.setName(teacherCourseGroup.getName());
                 groupCard.setSingleClassMinutes(teacherCourseGroup.getSingleClassMinutes());
                 groupCard.setSubjectId(teacherCourseGroup.getSubjectId());
+                groupCard.setGroupStatus(teacherCourseGroup.getStatus());
                 groupCard.setSubjectName(idSubjectMap.get(teacherCourseGroup.getSubjectId()).getName());
                 GroupCourseTimesDto groupCourseTimesInfo = groupCourseTimesInfoMap.get(String.valueOf(teacherCourseGroup.getId()));
                 GroupValidDateDto groupValidDate = groupValidateMap.get(String.valueOf(teacherCourseGroup.getId()));
-                groupCard.setCoursesStartDate(groupValidDate.getStartDate());
-                groupCard.setCoursesEndDate(groupValidDate.getEndDate());
+                if(Objects.nonNull(groupValidDate)){
+                    groupCard.setCoursesStartDate(groupValidDate.getStartDate());
+                    groupCard.setCoursesEndDate(groupValidDate.getEndDate());
+                }
                 groupCard.setClassGroupId(groupCourseTimesInfo.getClassGroupId());
                 groupCard.setTotalCourseTimes(groupCourseTimesInfo.getTotalCourseTimes());
                 groupCard.setSurplusClassTimes(groupCourseTimesInfo.getSurplusClassTimes());

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

@@ -141,13 +141,20 @@
 	</select>
 
     <select id="findTeacherCourseGroups" resultMap="CoursesGroup">
-		SELECT * FROM courses_group WHERE teacher_id_=#{teacherId} AND status_ IN ('APPLYING', 'NORMAL') ORDER BY id_ DESC
+		SELECT * FROM courses_group WHERE teacher_id_=#{teacherId}
+		<if test="groupStatus!=null">
+			AND status_ = #{groupStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+		</if>
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
     </select>
 
 	<select id="countTeacherGroups" resultType="int">
-		SELECT COUNT(id_) FROM courses_group WHERE teacher_id_=#{teacherId} AND status_ IN ('APPLYING', 'NORMAL')
-    </select>
+		SELECT COUNT(id_) FROM courses_group WHERE teacher_id_=#{teacherId}
+		<if test="groupStatus!=null">
+			AND status_ = #{groupStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+		</if>
+	</select>
 
     <select id="queryTeacherCourseGroups" resultMap="CoursesGroup">
 		SELECT * FROM courses_group

mec-common/common-core/src/main/java/com/ym/mec/common/config/LocalFastJsonHttpMessageConverter.java

@@ -35,7 +35,7 @@ public class LocalFastJsonHttpMessageConverter extends FastJsonHttpMessageConver
 
 		OutputStream out = outputMessage.getBody();
 		JsonUtil.getConfig().put(Date.class, new SimpleDateFormatSerializer(FORMAT));
-		JsonUtil.getConfig().put(String.class, new EmojiSerializer());
+		//JsonUtil.getConfig().put(String.class, new EmojiSerializer());
 		String text = JsonUtil.toJSONString(obj, EnumFilter.instance, getFeatures());
 		byte[] bytes = text.getBytes(getCharset());
 		out.write(bytes);

mec-student/src/main/java/com/ym/mec/student/StudentApplication.java

@@ -42,7 +42,7 @@ public class StudentApplication {
 	 * 注册filter
 	 * @return
 	 */
-	@Bean
+	//@Bean
 	public FilterRegistrationBean<Filter> filterRegistrationBean() {
 		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
 		// 注入过滤器

mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

@@ -42,7 +42,7 @@ public class TeacherApplication {
 	 * 注册filter
 	 * @return
 	 */
-	@Bean
+	//@Bean
 	public FilterRegistrationBean<Filter> filterRegistrationBean() {
 		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
 		// 注入过滤器

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

@@ -12,7 +12,6 @@ import com.ym.mec.biz.service.GroupClassService;
 import com.ym.mec.biz.service.GroupCourseScheduleService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +59,7 @@ public class CourseGroupController extends BaseController {
 
     @ApiOperation(value = "获取课程组列表")
     @GetMapping("/findTeacherCourseGroups")
-    public HttpResponseResult findTeacherCourseGroups(QueryInfo queryInfo){
+    public HttpResponseResult findTeacherCourseGroups(GroupCourseScheduleQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){
             return failed(HttpStatus.FORBIDDEN,"请登录");

mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -42,7 +42,7 @@ public class WebApplication {
 	 * 注册filter
 	 * @return
 	 */
-	@Bean
+	//@Bean
 	public FilterRegistrationBean<Filter> filterRegistrationBean() {
 		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
 		// 注入过滤器