学院

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

@@ -101,7 +101,7 @@ public class CensusController implements CensusControllerAPI {
                 BedTotalVo btv = new BedTotalVo();
                 btv.setCollege(org.getName());
                 btv.setSex(sexStr);
-                List<BedSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).collect(Collectors.toList());
+                List<BedSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).collect(Collectors.toList());
                 if (sqlDataCs != null && sqlDataCs.size() > 0) {
                     //int totalData = sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
                     //btv.setTotal(totalData);//总人数
@@ -120,7 +120,7 @@ public class CensusController implements CensusControllerAPI {
                     btv.setAssignedBuild(0);//已分配楼栋
                 }
 
-                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).findFirst();
+                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege() != null && e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).findFirst();
                 if (ostudent != null && ostudent.isPresent()) {
                     btv.setTotal(ostudent.get().getTotal());
                 } else {
@@ -170,7 +170,7 @@ public class CensusController implements CensusControllerAPI {
                 BedTotalVo btv = new BedTotalVo();
                 btv.setCollege(org.getName());
                 btv.setSex(sexStr);
-                List<BedSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).collect(Collectors.toList());
+                List<BedSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).collect(Collectors.toList());
                 if (sqlDataCs != null && sqlDataCs.size() > 0) {
                     //int totalData = sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
                     //btv.setTotal(totalData);//总人数
@@ -188,7 +188,7 @@ public class CensusController implements CensusControllerAPI {
                     btv.setAssignedDormitory(0);//已分配寝室
                     btv.setAssignedBuild(0);//已分配楼栋
                 }
-                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).findFirst();
+                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).findFirst();
                 if (ostudent != null && ostudent.isPresent()) {
                     btv.setTotal(ostudent.get().getTotal());
                 } else {
@@ -267,13 +267,13 @@ public class CensusController implements CensusControllerAPI {
                 SleepTotalVo btv = new SleepTotalVo();
                 btv.setCollege(org.getName());
                 btv.setSex(sexStr);
-                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).findFirst();
+                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null && e.getSex().equals(sexStr)).findFirst();
                 if (ostudent != null && ostudent.isPresent()) {
                     btv.setTotalData(ostudent.get().getTotal());
                 } else {
                     btv.setTotalData(0);
                 }
-                List<SleepSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).collect(Collectors.toList());
+                List<SleepSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).collect(Collectors.toList());
                 if (sqlDataCs != null && sqlDataCs.size() > 0) {
                     int toalData = btv.getTotalData();//sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
                     int sleeper = sqlDataCs.get(0).getSleeper() == null ? 0 : sqlDataCs.get(0).getSleeper();
@@ -337,13 +337,13 @@ public class CensusController implements CensusControllerAPI {
                 SleepTotalVo btv = new SleepTotalVo();
                 btv.setCollege(org.getName());
                 btv.setSex(sexStr);
-                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).findFirst();
+                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).findFirst();
                 if (ostudent != null && ostudent.isPresent()) {
                     btv.setTotalData(ostudent.get().getTotal());
                 } else {
                     btv.setTotalData(0);
                 }
-                List<SleepSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).collect(Collectors.toList());
+                List<SleepSqlTotalVo> sqlDataCs = sqlDatas.stream().filter(e -> e.getCollege()!= null && e.getCollege().equals(org.getName()) && e.getSex() != null &&  e.getSex().equals(sexStr)).collect(Collectors.toList());
                 if (sqlDataCs != null && sqlDataCs.size() > 0) {
                     int toalData = btv.getTotalData();//sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
                     int sleeper = sqlDataCs.get(0).getSleeper() == null ? 0 : sqlDataCs.get(0).getSleeper();