优化

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

@@ -64,11 +64,15 @@ public class CensusController implements CensusControllerAPI {
     @Override
     public CommonResult queryBedTotal(Integer collegeId, String sex) {
         List<BedTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges();
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
         List<String> sexs = new ArrayList<>();
-        sexs.add("男");
-        sexs.add("女");
+        if(StringUtils.hasText(sex)){
+            sexs.add(sex);
+        }else{
+            sexs.add("男");
+            sexs.add("女");
+        }
         for (WelcomeOrg org : orgs) {
             for (String sexStr :sexs){
                 BedTotalVo btv = new BedTotalVo();
@@ -102,11 +106,15 @@ public class CensusController implements CensusControllerAPI {
     @Override
     public void bedTotalExport(HttpServletResponse response, Integer collegeId, String sex) {
         List<BedTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges();
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
         List<String> sexs = new ArrayList<>();
-        sexs.add("男");
-        sexs.add("女");
+        if(StringUtils.hasText(sex)){
+            sexs.add(sex);
+        }else{
+            sexs.add("男");
+            sexs.add("女");
+        }
         for (WelcomeOrg org : orgs) {
             for (String sexStr :sexs){
                 BedTotalVo btv = new BedTotalVo();
@@ -174,11 +182,15 @@ public class CensusController implements CensusControllerAPI {
     @Override
     public CommonResult queryCheckTotal(Integer collegeId, String sex) {
         List<SleepTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges();
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
         List<String> sexs = new ArrayList<>();
-        sexs.add("男");
-        sexs.add("女");
+        if(StringUtils.hasText(sex)){
+            sexs.add(sex);
+        }else{
+            sexs.add("男");
+            sexs.add("女");
+        }
         for (WelcomeOrg org : orgs) {
             for (String sexStr :sexs){
                 SleepTotalVo btv = new SleepTotalVo();
@@ -212,11 +224,16 @@ public class CensusController implements CensusControllerAPI {
     @Override
     public void checkTotalExport(HttpServletResponse response, Integer collegeId, String sex) {
         List<SleepTotalVo> result = new ArrayList<>();
-        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges();
+        List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
         List<String> sexs = new ArrayList<>();
-        sexs.add("男");
-        sexs.add("女");
+        if(StringUtils.hasText(sex)){
+            sexs.add(sex);
+        }else{
+            sexs.add("男");
+            sexs.add("女");
+        }
+
         for (WelcomeOrg org : orgs) {
             for (String sexStr :sexs){
                 SleepTotalVo btv = new SleepTotalVo();

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

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

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +37,21 @@ public class WelcomeOrgServiceImpl extends ServiceImpl<WelcomeOrgMapper, Welcome
     }
 
     @Override
+    public List<WelcomeOrg> queryColleges(Integer collegeId) {
+
+        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);
+        }
+        return result;
+    }
+
+    @Override
     public List<WelcomeOrg> queryMajors(Integer collegeId) {
         QueryWrapper<WelcomeOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type_id",2);