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

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

@@ -0,0 +1,37 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class ConditionDto {
+
+    @ApiModelProperty(value = "条件ID",required = false)
+    private Long id;
+
+    @ApiModelProperty(value = "条件名称",required = false)
+    private String name;
+
+    public ConditionDto(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class StudentVipGroupQueryInfo extends QueryInfo {
+
+    private Long subjectId;
+
+    private Long classType;
+
+    public Long getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Long getClassType() {
+        return classType;
+    }
+
+    public void setClassType(Long classType) {
+        this.classType = classType;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.dto.VipGroupManageDetailDto;
 import com.ym.mec.biz.dal.entity.VipGroup;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
@@ -23,7 +24,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @Date: 2019/9/23
      * 获取可购买vip课列表
      */
-    PageInfo findStudentVipGroupList(QueryInfo queryInfo);
+    PageInfo findStudentVipGroupList(StudentVipGroupQueryInfo queryInfo);
 
     /**
      * @Author: Joburgess

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.VipGroupService;
@@ -70,7 +71,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
-	public PageInfo findStudentVipGroupList(QueryInfo queryInfo) {
+	public PageInfo findStudentVipGroupList(StudentVipGroupQueryInfo queryInfo) {
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);

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

@@ -96,7 +96,7 @@
     </update>
 
     <update id="updateUserLockStatus">
-		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,9,0) WHERE id_=#{userID}
+		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,1,0) WHERE id_=#{userID}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -130,6 +130,7 @@
 
     <sql id="queryCondition">
         <where>
+            su.user_type_='SYSTEM'
             <if test="organId != null">
                 and su.organ_id_ = #{organId}
             </if>

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

@@ -145,7 +145,16 @@
 		SELECT COUNT(*) FROM vip_group
 	</select>
 
-
+    <sql id="studentVipGroupQueryCondition">
+        <where>
+            <if test="subjectId!=null">
+                FIND_IN_SET(#{subjectId},cg.subject_id_list_)
+            </if>
+            <if test="classType!=null">
+                AND cg.teach_mode_=#{classType}
+            </if>
+        </where>
+    </sql>
 
     <select id="findVipGroups" resultMap="studentVipGroup">
        SELECT
@@ -166,6 +175,7 @@
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             LEFT JOIN class_group_teacher_mapper cgtm ON vgcgm.class_group_id_=cgtm.class_group_id_
             LEFT JOIN sys_user su ON cgtm.user_id_=su.id_
+            <include refid="studentVipGroupQueryCondition"/>
         ORDER BY vg.id_ DESC
         <include refid="global.limit"/>
     </select>
@@ -174,6 +184,9 @@
             count(*)
         FROM
             vip_group vg
+        LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_=vgcgm.vip_group_id_
+        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
+        <include refid="studentVipGroupQueryCondition"/>
     </select>
     <select id="getVipGroupBaseInfo" resultMap="vipGroupManageDetailDto">
         SELECT

mec-student/src/main/java/com/ym/mec/student/controller/StudentVipGroupController.java

@@ -1,6 +1,9 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.dto.ConditionDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
+import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -9,6 +12,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/23
@@ -21,11 +29,28 @@ public class StudentVipGroupController extends BaseController {
 
     @Autowired
     private VipGroupService vipGroupService;
+    @Autowired
+    private SubjectService subjectService;
+
+    @ApiOperation("获取vip课列表筛选条件")
+    @GetMapping(value = "/findQueryCondition")
+    public Object findQueryCondition(){
+        Map<String,Object> result=new HashMap<>();
+        result.put("subjects",subjectService.findAll(null));
+        List<ConditionDto> conditionDtos=new ArrayList<>();
+        conditionDtos.add(new ConditionDto(0L,"线下"));
+        conditionDtos.add(new ConditionDto(1L,"线上"));
+        result.put("pageInfo",conditionDtos);
+        return succeed(result);
+    }
 
     @ApiOperation("获取vip课列表")
     @GetMapping(value = "/queryVipGroups")
-    public Object queryVipGroups(QueryInfo queryInfo){
-        return succeed(vipGroupService.findStudentVipGroupList(queryInfo));
+    public Object queryVipGroups(StudentVipGroupQueryInfo queryInfo){
+        Map<String,Object> result=new HashMap<>();
+        result.put("recommendVipGroups",new ArrayList<>());
+        result.put("pageInfo",vipGroupService.findStudentVipGroupList(queryInfo));
+        return succeed(result);
     }
 
     @ApiOperation("获取学生端vip课显示详情")