统计修改

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

@@ -20,17 +20,17 @@ public interface CensusControllerAPI {
 
     @GetMapping(value = "/queryBedTotal")
     @ApiOperation(value = "床位分配统计", notes = "床位分配统计", httpMethod = "GET")
-    CommonResult queryBedTotal(Integer collegeId, String sex);
+    CommonResult queryBedTotal(@RequestAttribute String userId,Integer collegeId, String sex);
 
     @GetMapping(value = "bedTotalExport")
     @ApiOperation(value = "导出床位分配统计数据", notes = "导出床位分配统计数据", httpMethod = "GET")
-    void bedTotalExport(HttpServletResponse response, Integer collegeId, String sex);
+    void bedTotalExport(HttpServletResponse response, @RequestAttribute String userId,Integer collegeId, String sex);
 
     @GetMapping(value = "/queryCheckTotal")
     @ApiOperation(value = "床位入住统计", notes = "床位入住统计", httpMethod = "GET")
-    CommonResult queryCheckTotal(Integer collegeId, String sex);
+    CommonResult queryCheckTotal(@RequestAttribute String userId,Integer collegeId, String sex);
 
     @GetMapping(value = "checkTotalExport")
     @ApiOperation(value = "导出床位入住统计数据", notes = "导出床位入住统计数据", httpMethod = "GET")
-    void checkTotalExport(HttpServletResponse response, Integer collegeId, String sex);
+    void checkTotalExport(HttpServletResponse response, @RequestAttribute String userId,Integer collegeId, String sex);
 }

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

@@ -55,6 +55,9 @@ public class CensusController implements CensusControllerAPI {
     @Autowired
     private WelcomeStudentService welcomeStudentService;
 
+    @Autowired
+    private WelcomeAccountService welcomeAccountService;
+
     // #分配
     // #总人数 totalData
     // #已分配床位数 根据性别、学院求和的 totalBed
@@ -65,9 +68,24 @@ public class CensusController implements CensusControllerAPI {
     // where wb.deleted = 0 and wb.college is not null and wb.college != ''
     // group by wb.college,wb.sex,wb.build,wb.dormitory
     @Override
-    public CommonResult queryBedTotal(Integer collegeId, String sex) {
+    public CommonResult queryBedTotal(String userId, Integer collegeId, String sex) {
         List<BedTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
+
+        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))) {
+                return CommonResult.ok(result);
+            }else {
+                collegeIds = new ArrayList<>();
+                collegeIds.add(String.valueOf(collegeId));
+            }
+        }
+
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
         List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
         List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
 
@@ -116,9 +134,25 @@ public class CensusController implements CensusControllerAPI {
     }
 
     @Override
-    public void bedTotalExport(HttpServletResponse response, Integer collegeId, String sex) {
+    public void bedTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex) {
         List<BedTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
+        WelcomeAccount wa = welcomeAccountService.getManageById(userId);
+        if (wa == null) {
+            System.out.println("当前账户已失效，无权限查看");
+            ExcelUtils.excelDownload(null, "床位分配统计.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);
+            }else {
+                collegeIds = new ArrayList<>();
+                collegeIds.add(String.valueOf(collegeId));
+            }
+        }
+
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
         List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
         List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
 
@@ -200,9 +234,23 @@ public class CensusController implements CensusControllerAPI {
     //    where wb.deleted = 0 and wb.college is not null
     //    group by wb.college,wb.sex
     @Override
-    public CommonResult queryCheckTotal(Integer collegeId, String sex) {
+    public CommonResult queryCheckTotal(String userId, Integer collegeId, String sex) {
         List<SleepTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
+        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))) {
+                return CommonResult.ok(result);
+            }else {
+                collegeIds = new ArrayList<>();
+                collegeIds.add(String.valueOf(collegeId));
+            }
+        }
+
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
         List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
         List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
 
@@ -251,9 +299,25 @@ public class CensusController implements CensusControllerAPI {
     }
 
     @Override
-    public void checkTotalExport(HttpServletResponse response, Integer collegeId, String sex) {
+    public void checkTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex) {
         List<SleepTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
+        WelcomeAccount wa = welcomeAccountService.getManageById(userId);
+        if (wa == null) {
+            System.out.println("当前账户已失效，无权限查看");
+            ExcelUtils.excelDownload(null, "床位入住统计.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);
+            }else {
+                collegeIds = new ArrayList<>();
+                collegeIds.add(String.valueOf(collegeId));
+            }
+        }
+
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
         List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
         List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
 

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

@@ -18,7 +18,7 @@ public interface WelcomeOrgService extends IService<WelcomeOrg> {
     List<WelcomeOrg> queryColleges();
 
     //获取学院下拉数据
-    List<WelcomeOrg> queryColleges(Integer collegeId);
+    List<WelcomeOrg> queryColleges(List<String> collegeIds);
 
     //获取专业下拉数据
     List<WelcomeOrg> queryMajors(Integer collegeId);

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

@@ -37,17 +37,9 @@ public class WelcomeOrgServiceImpl extends ServiceImpl<WelcomeOrgMapper, Welcome
     }
 
     @Override
-    public List<WelcomeOrg> queryColleges(Integer collegeId) {
+    public List<WelcomeOrg> queryColleges(List<String> collegeIds) {
 
-        List<WelcomeOrg> result = new ArrayList<>();
-        if(collegeId != null){
-            WelcomeOrg wo = welcomeOrgMapper.selectById(collegeId);
-            result.add(wo);
-        }else{
-            QueryWrapper<WelcomeOrg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("type_id",1);
-            result = welcomeOrgMapper.selectList(queryWrapper);
-        }
+        List<WelcomeOrg> result = welcomeOrgMapper.selectBatchIds(collegeIds);
         return result;
     }