用户查询

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

@@ -30,7 +30,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/queryPageStudents")
     @ApiOperation(value = "学生信息分页数据", notes = "学生信息分页数据", httpMethod = "GET")
-    CommonResult queryPageStudents(@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
 
     @GetMapping(value = "/queryStudentDetail")
     @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
@@ -54,7 +54,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "welcomeStudentExport")
     @ApiOperation(value = "导出学生信息数据", notes = "导出学生信息数据", httpMethod = "GET")
-    void welcomeStudentExport(HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
 
 
     @GetMapping(value = "/studentOverview")

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

@@ -136,16 +136,18 @@ public class CensusController implements CensusControllerAPI {
     @Override
     public void bedTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex) {
         List<BedTotalVo> result = new ArrayList<>();
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("床位分配统计");
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
         if (wa == null) {
             System.out.println("当前账户已失效，无权限查看");
-            ExcelUtils.excelDownload(null, "床位分配统计.xlsx", response);
+            ExcelUtils.excelDownload(workbook, "床位分配统计.xlsx", response);
         }
         List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
         if(collegeId != null && collegeId.intValue() > 0){
             if (!collegeIds.contains(String.valueOf(collegeId))) {
 
-                ExcelUtils.excelDownload(null, "床位分配统计.xlsx", response);
+                ExcelUtils.excelDownload(workbook, "床位分配统计.xlsx", response);
             }else {
                 collegeIds = new ArrayList<>();
                 collegeIds.add(String.valueOf(collegeId));
@@ -196,8 +198,7 @@ public class CensusController implements CensusControllerAPI {
             }
         }
         //导出
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet("床位分配统计");
+
 
         Row headerRow = sheet.createRow(0);
         headerRow.createCell(0).setCellValue("序号");
@@ -301,16 +302,18 @@ public class CensusController implements CensusControllerAPI {
     @Override
     public void checkTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex) {
         List<SleepTotalVo> result = new ArrayList<>();
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("床位入住统计");
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
         if (wa == null) {
             System.out.println("当前账户已失效，无权限查看");
-            ExcelUtils.excelDownload(null, "床位入住统计.xlsx", response);
+            ExcelUtils.excelDownload(workbook, "床位入住统计.xlsx", response);
         }
         List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
         if(collegeId != null && collegeId.intValue() > 0){
             if (!collegeIds.contains(String.valueOf(collegeId))) {
 
-                ExcelUtils.excelDownload(null, "床位入住统计.xlsx", response);
+                ExcelUtils.excelDownload(workbook, "床位入住统计.xlsx", response);
             }else {
                 collegeIds = new ArrayList<>();
                 collegeIds.add(String.valueOf(collegeId));
@@ -363,8 +366,7 @@ public class CensusController implements CensusControllerAPI {
             }
         }
         //导出
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet("床位入住统计");
+
 
         Row headerRow = sheet.createRow(0);
         headerRow.createCell(0).setCellValue("序号");

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

@@ -6,7 +6,9 @@ import com.auth0.jwt.interfaces.Claim;
 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.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.annotation.PassToken;
 import com.template.api.WelcomeStudentControllerAPI;
 import com.template.common.utils.ExcelUtils;
@@ -79,6 +81,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     private WelcomeBedService welcomeBedService;
 
     @Autowired
+    private WelcomeAccountService welcomeAccountService;
+
+    @Autowired
     private WelcomeSettingService welcomeSettingService;
 
     @Autowired
@@ -457,8 +462,25 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageStudents(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
-        PageUtils<StudentPageVo> result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeId, majorId, classstrId, trafficMethod, name);
+    public CommonResult queryPageStudents(String userId,int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+        IPage<StudentPageVo> pages = new Page<>();
+        PageUtils<StudentPageVo> result =new PageUtils<>(pages);
+        WelcomeAccount wa = welcomeAccountService.getManageById(userId);
+        if (wa == null) {
+            return CommonResult.fail("当前账户已失效，无权限查看");
+        }
+        List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
+        if(collegeId != null && collegeId.intValue() > 0){
+            if (!collegeIds.contains(String.valueOf(collegeId))) {
+                pages.setCurrent(currentPage);
+                pages.setSize(pageCount);
+                return CommonResult.ok(result);
+            }else {
+                collegeIds = new ArrayList<>();
+                collegeIds.add(String.valueOf(collegeId));
+            }
+        }
+        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name);
         return CommonResult.ok(result);
     }
 
@@ -1426,11 +1448,27 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public void welcomeStudentExport(HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
-        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeId, majorId, classstrId, trafficMethod, name);
-        //导出
+    public void welcomeStudentExport(String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("学生信息");
+        WelcomeAccount wa = welcomeAccountService.getManageById(userId);
+        if (wa == null) {
+            System.out.println("当前账户已失效，无权限查看");
+            ExcelUtils.excelDownload(workbook, "学生信息.xlsx", response);
+        }
+        List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
+        if(collegeId != null && collegeId.intValue() > 0){
+            if (!collegeIds.contains(String.valueOf(collegeId))) {
+
+                ExcelUtils.excelDownload(workbook, "学生信息.xlsx", response);
+            }else {
+                collegeIds = new ArrayList<>();
+                collegeIds.add(String.valueOf(collegeId));
+            }
+        }
+
+        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name);
+        //导出
 
         Row headerRow = sheet.createRow(0);
         headerRow.createCell(0).setCellValue("序号");

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

@@ -19,9 +19,9 @@ import java.util.List;
  */
 @Repository
 public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
-    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeId") Integer collegeId,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
+    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeIds") List<String> collegeIds,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
 
-    List<StudentPageVo> queryStudentPageList(@Param("collegeId") Integer collegeId, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
+    List<StudentPageVo> queryStudentPageList(@Param("collegeIds") List<String> collegeIds, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
 
     List<StudentRegisterVo> studentRegister();
 

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

@@ -31,13 +31,13 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     WelcomeStudent getDataByIdcard(String cardId);
 
-    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name);
 
     WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId);
 
     List<WelcomeStudent> queryStudentByCardId(List<String> cardIds);
 
-    List<StudentPageVo> queryStudentList(Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    List<StudentPageVo> queryStudentList(List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name);
 
     WelcomeStudent queryStudentInfo(Integer collegeId, Integer majorId, Integer classstrId,String admissNum);
 

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

@@ -77,18 +77,18 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name) {
         Page<StudentPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeId, majorId, classstrId, trafficMethod, name);
+        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name);
         return new PageUtils(result);
     }
 
     @Override
-    public List<StudentPageVo> queryStudentList( Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeId, majorId, classstrId, trafficMethod, name);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name);
         return result;
     }
 

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

@@ -26,8 +26,11 @@
         from welcome_student ws
         left join welcome_bed wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
         where ws.deleted = 0
-        <if test="collegeId != null and collegeId != ''">
-            and ws.college_id = #{collegeId}
+        <if test="collegeIds != null and collegeIds.size() > 0">
+            and ws.college_id in
+            <foreach collection="collegeIds" item="collegeId" index="index" open="(" close=")" separator=",">
+                ${collegeId}
+            </foreach>
         </if>
         <if test="majorId != null and majorId != ''">
             and ws.major_id = #{majorId}