后台查询逻辑调整

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/AdminCourseGroupController.java

@@ -18,6 +18,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,7 +44,9 @@ public class AdminCourseGroupController extends BaseController {
     @PostMapping(value="/live/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<LiveCourseGroupVo>> teacherList(@Validated(value = LiveCourseGroupSearch.TeacherGroup.class)
                                                                            @RequestBody LiveCourseGroupSearch query) {
-        query.setCourseType(CourseScheduleEnum.LIVE);
+        if(query.getCourseType() == null){
+            query.setCourseType(CourseScheduleEnum.LIVE);
+        }
 
         IPage<LiveCourseGroupVo> liveCourseGroupVoIPage = courseGroupService
                 .selectAdminLivePage(PageUtil.getPage(query), query);
@@ -55,7 +58,9 @@ public class AdminCourseGroupController extends BaseController {
     @PostMapping(value="/live/list/student", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<LiveCourseGroupVo>> studentList(@Validated(value = LiveCourseGroupSearch.StudentGroup.class)
                                                                            @RequestBody LiveCourseGroupSearch query) {
-        query.setCourseType(CourseScheduleEnum.LIVE);
+        if(query.getCourseType() == null){
+            query.setCourseType(CourseScheduleEnum.LIVE);
+        }
 
         IPage<LiveCourseGroupVo> liveCourseGroupVoIPage = courseGroupService
                 .selectAdminLivePage(PageUtil.getPage(query), query);

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/CourseGroupController.java

@@ -12,10 +12,12 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -28,9 +30,9 @@ import java.util.List;
 @Api(tags = "课程组")
 @Validated
 public class CourseGroupController extends BaseController {
-    @Autowired
+    @Resource
     private CourseGroupService courseGroupService;
-    @Autowired
+    @Resource
     private CourseScheduleService courseScheduleService;
 
     @ApiOperation(value = "课程组管理-趣纠课", notes = "{\n" +
@@ -65,6 +67,9 @@ public class CourseGroupController extends BaseController {
             "}")
     @PostMapping(value = "/live")
     public HttpResponseResult<PageInfo<CourseGroupLiveVo>> selectLiveGroup(@RequestBody CourseGroupSearch search) {
+        if(StringUtils.isEmpty(search.getGroupType())){
+            search.setGroupType("LIVE");
+        }
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroup(PageUtil.getPage(search), search)));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/CourseGroupSearch.java

@@ -70,6 +70,6 @@ public class CourseGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "是否草稿 （0:否  1：是）",hidden = true)
     private Integer draftFlag;
 
-    @ApiModelProperty(value = "课程组类型 VIP 、PRACTICE")
-    private String groupType = "PRACTICE";
+    @ApiModelProperty(value = "课程组类型 VIP 、PRACTICE、GROUP")
+    private String groupType;
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -22,7 +22,8 @@ public class OrderSearch extends QueryInfo{
 	@ApiModelProperty("下单应用：STUDENT 学生端 TEACHER 老师端")
 	private String orderClient;
 
-	@ApiModelProperty("交易类型:  VIP、开通会员  SVIP、开通会员 PRACTICE、趣纠课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名（多选用,分割）、VIP_COURSE VIP定制课、DISCOUNT 畅学卡")
+	@ApiModelProperty("交易类型:  VIP、开通会员  SVIP、开通会员 PRACTICE、趣纠课购买  LIVE、直播课购买 VIDEO、视频课购买 " +
+			"MUSIC、单曲点播 ACTI_REGIST、活动报名（多选用,分割）、VIP_COURSE VIP定制课、DISCOUNT 畅学卡、GROUP 小组课")
 	private String orderType;
 
 	@ApiModelProperty("订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 FAIL 支付失败 （多选用,分割）")

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -500,23 +500,27 @@
         FROM course_group cg
         LEFT JOIN `subject` sb ON cg.subject_id_=sb.id_
         LEFT JOIN sys_user su ON su.id_=cg.teacher_id_
-        LEFT JOIN (SELECT course_group_id_,COUNT(1) AS count_ FROM course_schedule WHERE type_='LIVE' AND status_='COMPLETE' GROUP BY course_group_id_) cm ON cg.id_=cm.course_group_id_
-        LEFT JOIN (SELECT course_group_id_,start_time_ FROM course_schedule WHERE type_='LIVE' GROUP BY course_group_id_) st ON cg.id_=st.course_group_id_
-        WHERE cg.type_='LIVE'
-        <if test="param.search != null and param.search != ''">
-            AND (
-            cg.id_ LIKE concat('%',#{param.search},'%') OR
-            cg.teacher_id_ LIKE concat('%',#{param.search},'%') OR
-            cg.name_ LIKE concat('%',#{param.search},'%') OR
-            su.username_ LIKE concat('%',#{param.search},'%')
-            )
-        </if>
-        <if test="param.subjectId != null">
-            AND cg.subject_id_ = #{param.subjectId}
-        </if>
-        <if test="param.status != null and param.status != ''">
-            AND cg.status_ = #{param.status}
-        </if>
+        LEFT JOIN (SELECT course_group_id_,COUNT(1) AS count_ FROM course_schedule WHERE type_ = #{param.groupType} AND status_='COMPLETE' GROUP BY course_group_id_) cm ON cg.id_=cm.course_group_id_
+        LEFT JOIN (SELECT course_group_id_,start_time_ FROM course_schedule WHERE type_ = #{param.groupType} GROUP BY course_group_id_) st ON cg.id_=st.course_group_id_
+        <where>
+            <if test="param.search != null and param.search != ''">
+                AND (
+                cg.id_ LIKE concat('%',#{param.search},'%') OR
+                cg.teacher_id_ LIKE concat('%',#{param.search},'%') OR
+                cg.name_ LIKE concat('%',#{param.search},'%') OR
+                su.username_ LIKE concat('%',#{param.search},'%')
+                )
+            </if>
+            <if test="param.subjectId != null">
+                AND cg.subject_id_ = #{param.subjectId}
+            </if>
+            <if test="param.groupType != null and param.groupType != ''">
+                AND cg.type_ = #{param.groupType}
+            </if>
+            <if test="param.status != null and param.status != ''">
+                AND cg.status_ = #{param.status}
+            </if>
+        </where>
     </select>
     <select id="selectLiveGroupStudent" resultType="com.yonge.cooleshow.biz.dal.vo.CourseSchedulePaymentVo">
         SELECT