change před 3 roky
rodič
revize
ac815354f5

+ 13 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserListVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.inform.bo.InformUserQueryBo;
@@ -110,6 +111,18 @@ public class InformController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("查询未分班下的学员")
+    @PreAuthorize("@ss.hasPermi('system:grade:list')")
+    @GetMapping("/listGradeStudy")
+    public TableDataInfo<ClassGradeStudentVo> listGradeStudy(ClassGradeQueryBo bo) {
+        startPage();
+        List<ClassGradeStudentVo> list = iClassGradeService.listGradeStudy(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 有多少学员无该课程或题库
      */

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -28,4 +28,6 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
 
     List<ClassGradeUserListVo> listGradeInform(ClassGradeQueryBo bo);
+
+    List<ClassGradeStudentVo> listGradeStudy(ClassGradeQueryBo bo);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -55,4 +55,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
     boolean editUserGrade(ClassGradeUserAddQueryBo bo);
 
 	List<ClassGradeUserListVo> listGradeInform(ClassGradeQueryBo bo);
+
+	List<ClassGradeStudentVo> listGradeStudy(ClassGradeQueryBo bo);
 }

+ 6 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -250,8 +250,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         for (ClassGradeUserListVo classGradeVo : classGradeVos) {
             ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
             classGradeUserQueryBo.setGradeId(classGradeVo.getGradeId());
-            classGradeVo.setClassGradeStudentVos(listGrade(classGradeUserQueryBo));
+            classGradeVo.setClassGradeStudentVos(baseMapper.listGrade(classGradeUserQueryBo));
         }
         return classGradeVos;
     }
+
+    @Override
+    public List<ClassGradeStudentVo> listGradeStudy(ClassGradeQueryBo bo) {
+        return baseMapper.listGradeStudy(bo);
+    }
 }

+ 20 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -392,4 +392,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by g.update_time desc
     </select>
+
+    <select id="listGradeStudy"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassGradeStudentVo">
+        SELECT
+            u.student_code,
+            u.user_id,
+            u.realname,
+            u.id_card,
+            u.telphone
+        FROM
+            `user` u
+        WHERE
+            1 = 1
+          and u.user_id not in (SELECT DISTINCT cgu.user_id from class_grade_user cgu )
+        <if test="status != null and status.size()!=0 ">
+            AND u.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>