调整61活动学员可排课次数

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

@@ -212,13 +212,6 @@ public interface StudentManageService {
     PageInfo<StudentLeaveCourseDto> queryStudentLeaveCourseList(StudentErrorLeaveQueryInfo queryInfo);
 
     /**
-     * 获取六一活动学员列表，用于修改学员排课资格
-     * @param queryInfo
-     * @return
-     */
-    PageInfo<StudentManageListDto> queryChildrenDayStudentList(StudentManageQueryInfo queryInfo);
-
-    /**
      * 修改学员排课资格
      * @param activityCourseDetailDto
      */

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

@@ -894,25 +894,6 @@ public class StudentManageServiceImpl implements StudentManageService {
         return pageInfo;
     }
 
-    @Override
-    public PageInfo<StudentManageListDto> queryChildrenDayStudentList(StudentManageQueryInfo queryInfo) {
-        PageInfo<StudentManageListDto> pageInfo = new PageInfo<StudentManageListDto>(queryInfo.getPage(), queryInfo.getRows());
-        Map<String, Object> params = new HashMap<String, Object>();
-        MapUtil.populateMap(params, queryInfo);
-
-        String[] organIds = queryInfo.getOrganId().split(",");
-        params.put("organIds", organIds);
-
-        List<StudentManageListDto> dataList = null;
-        int count = studentManageDao.countStudentByOrganId(params);
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            params.put("offset", pageInfo.getOffset());
-            dataList = studentManageDao.findStudentsByOrganId(params);
-        }
-        pageInfo.setRows(dataList);
-        return pageInfo;
-    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

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

@@ -26,6 +26,9 @@
         <result column="membership_start_time_" property="membershipStartTime"/>
         <result column="membership_end_time_" property="membershipEndTime"/>
         <result column="activity_course_detail_" property="activityCourseDetail"/>
+        <result column="organ_name_" property="organName"/>
+        <result column="phone_" property="phone"/>
+        <result column="username_" property="username"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -144,15 +147,30 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Student" parameterType="map">
-        SELECT * FROM student
+        SELECT s.*,su.username_,su.phone_,o.name_ organ_name_ FROM student s
+        LEFT JOIN sys_user su ON  su.id_ = s.user_id_
+        LEFT JOIN organization o ON  o.id_ = su.organ_id_
+        <include refid="queryPageSql"/>
+        ORDER BY activity_course_detail_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM student
+        SELECT COUNT(s.id_) FROM student s
+        LEFT JOIN sys_user su ON  su.id_ = s.user_id_
+        <include refid="queryPageSql"/>
     </select>
+    <sql id="queryPageSql">
+        <where>
+            <if test="organId != null">
+                AND su.organ_id_ = #{organId}
+            </if>
+            <if test="search != null">
+                AND (s.user_id_ = #{search} OR su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
+            </if>
+        </where>
+    </sql>
     <select id="findStudents" resultMap="com.ym.mec.biz.dal.dao.TeacherDao.SysUser">
         SELECT id_, username_, phone_,avatar_ FROM sys_user
         <include refid="studentQueryCondition"/>

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

@@ -1,18 +1,19 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.ActivityCourseDetailDto;
+import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.page.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,21 +24,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
-import com.ym.mec.biz.dal.entity.Employee;
-import com.ym.mec.biz.dal.entity.Student;
-import com.ym.mec.biz.service.MusicGroupStudentFeeService;
-import com.ym.mec.biz.service.StudentCourseHomeworkService;
-import com.ym.mec.biz.service.StudentManageService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.StudentService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.QueryInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 @Api(tags = "学生管理")
 @RestController
@@ -132,7 +122,7 @@ public class StudentManageController extends BaseController {
                 return failed("非法请求");
             }
         }
-        return succeed(studentManageService.queryChildrenDayStudentList(queryInfo));
+        return succeed(studentService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "修改学员排课资格")