修改驾驶舱学生汇总接口

src/main/java/com/template/api/DriverStockControllerAPI.java

@@ -51,7 +51,7 @@ public interface DriverStockControllerAPI {
 
     @RequestMapping(value = "/getUserPage")
     @ResponseBody
-    public CommonResult getUserPage(int currentPage, int pageCount,String key,Integer identityId);
+    public CommonResult getUserPage(int currentPage, int pageCount,String key,Integer identityId,Integer grader,Integer classId);
 
     @RequestMapping(value = "/getScorePer")
     @ResponseBody

src/main/java/com/template/controller/DriverStockController.java

@@ -1,6 +1,8 @@
 package com.template.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.pagehelper.PageHelper;
@@ -9,6 +11,7 @@ import com.template.annotation.DESRespondSecret;
 import com.template.annotation.PassToken;
 import com.template.api.DriverStockControllerAPI;
 import com.template.common.utils.TimeExchange;
+import com.template.model.pojo.SmartClass;
 import com.template.model.pojo.SmartUser;
 import com.template.model.pojo.SmartWarning;
 import com.template.model.result.CommonResult;
@@ -16,6 +19,7 @@ import com.template.model.result.PageUtils;
 import com.template.model.tongji.*;
 import com.template.model.vo.VisitorTjVo;
 import com.template.services.DriverStockService;
+import com.template.services.SmartClassService;
 import com.template.services.SmartUserService;
 import com.template.services.SmartWarningService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +45,9 @@ public class DriverStockController implements DriverStockControllerAPI {
     @Autowired
     public SmartUserService smartUserService;
 
+    @Autowired
+    public SmartClassService smartClassService;
+
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
@@ -231,9 +238,27 @@ public class DriverStockController implements DriverStockControllerAPI {
     @Override
     @PassToken
     @DESRespondSecret(validated = false)
-    public CommonResult getUserPage(int currentPage, int pageCount, String key, Integer identityId) {
+    public CommonResult getUserPage(int currentPage, int pageCount, String key, Integer identityId,Integer graderId,Integer classId) {
+//        查询对应的班级
+        LambdaQueryWrapper<SmartClass> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(graderId),SmartClass::getGradeId,graderId)
+                        .eq(ObjectUtils.isNotEmpty(classId),SmartClass::getId,classId);
+        List<SmartClass> smartClasses = smartClassService.list(wrapper);
+//        组合班级id
+        String classIds="";
+        for (int i = 0; i < smartClasses.size(); i++) {
+            SmartClass smartClass = smartClasses.get(i);
+            String id = smartClass.getId()+"";
+            if (0==i) {
+                classIds=id;
+            }else {
+                classIds=classIds+","+id;
+            }
+        }
+
+
         PageHelper.startPage(currentPage, pageCount);
-        PageInfo<userPage> list = driverStockService.getUserPage(key, identityId);
+        PageInfo<userPage> list = driverStockService.getUserPage(key, identityId,classIds);
         return CommonResult.ok(list);
     }
 

src/main/java/com/template/mapper/DriverStockMapper.java

@@ -40,7 +40,7 @@ public interface DriverStockMapper extends BaseMapper<T> {
     public List<Tj> getUserComp();
 
     // 用户汇总学生
-    public List<userPage> getUserPage(@Param("key") String key,@Param("identityId") Integer identityId);
+    public List<userPage> getUserPage(@Param("key") String key,@Param("identityId") Integer identityId,@Param("classIds") String classIds);
 
     // 教学成果
     public List<Tj> getScorePer(@Param("examName") String examName,@Param("updateUser") String updateUser);

src/main/java/com/template/services/DriverStockService.java

@@ -39,7 +39,7 @@ public interface DriverStockService {
     public List<Tj> getUserComp();
 
     // 用户汇总学生
-    public PageInfo<userPage> getUserPage(String key,Integer identityId);
+    public PageInfo<userPage> getUserPage(String key,Integer identityId,String classIds);
 
     // 教学成果
     public List<Tj> getScorePer(@Param("examName") String examName,@Param("updateUser") String updateUser);

src/main/java/com/template/services/impl/DriverStockServiceImpl.java

@@ -65,8 +65,8 @@ public class DriverStockServiceImpl implements DriverStockService {
     }
 
     // 用户汇总学生
-    public PageInfo<userPage> getUserPage(String key,Integer identityId){
-        List<userPage> list = driverStockMapper.getUserPage(key,identityId);
+    public PageInfo<userPage> getUserPage(String key,Integer identityId,String classIds){
+        List<userPage> list = driverStockMapper.getUserPage(key,identityId,classIds);
         PageInfo<userPage> meterPageInfo = new PageInfo<>(list);
         return meterPageInfo;
     }

src/main/resources/mapper/template/DriverStockMapper.xml

@@ -105,6 +105,7 @@ where a.deleted =0 and a.is_cancel = 0) c group by `name`
         `smart_user` a
         left join `smart_department` b on a.`department_id`=b.id
         where a.`deleted`=0 and a.identity_id=#{identityId}
+        and FIND_IN_SET(a.school_class,#{classIds})
         <if test="key != null and key != ''">
             and (a.name like '%' #{key} '%' or a.card_no like '%' #{key} '%')
         </if>