总人数

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

@@ -52,6 +52,9 @@ public class CensusController implements CensusControllerAPI {
     @Autowired
     private WelcomeOrgService welcomeOrgService;
 
+    @Autowired
+    private WelcomeStudentService welcomeStudentService;
+
     // #分配
     // #总人数 totalData
     // #已分配床位数 根据性别、学院求和的 totalBed
@@ -66,36 +69,45 @@ public class CensusController implements CensusControllerAPI {
         List<BedTotalVo> result = new ArrayList<>();
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+
         List<String> sexs = new ArrayList<>();
-        if(StringUtils.hasText(sex)){
+        if (StringUtils.hasText(sex)) {
             sexs.add(sex);
-        }else{
+        } else {
             sexs.add("男");
             sexs.add("女");
         }
         for (WelcomeOrg org : orgs) {
-            for (String sexStr :sexs){
+            for (String sexStr : sexs) {
                 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().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);//总人数
+                if (sqlDataCs != null && sqlDataCs.size() > 0) {
+                    //int totalData = sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
+                    //btv.setTotal(totalData);//总人数
                     int bedTotals = 0;
-                    for (BedSqlTotalVo d:sqlDataCs) {
+                    for (BedSqlTotalVo d : sqlDataCs) {
                         bedTotals = bedTotals + d.getTotalBed();
                     }
                     btv.setAssignedBed(bedTotals);//已分配床
                     btv.setAssignedDormitory(sqlDataCs.size());//已分配寝室
-                    int buildCount = (int)sqlDataCs.stream().map(BedSqlTotalVo::getBuild).distinct().count();
+                    int buildCount = (int) sqlDataCs.stream().map(BedSqlTotalVo::getBuild).distinct().count();
                     btv.setAssignedBuild(buildCount);//已分配楼栋
-                }else{
-                    btv.setTotal(0);
+                } else {
+                    //btv.setTotal(0);
                     btv.setAssignedBed(0);//已分配床
                     btv.setAssignedDormitory(0);//已分配寝室
                     btv.setAssignedBuild(0);//已分配楼栋
                 }
+
+                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex().equals(sexStr)).findFirst();
+                if (ostudent != null && ostudent.isPresent()) {
+                    btv.setTotal(ostudent.get().getTotal());
+                } else {
+                    btv.setTotal(0);
+                }
                 result.add(btv);
             }
         }
@@ -108,36 +120,44 @@ public class CensusController implements CensusControllerAPI {
         List<BedTotalVo> result = new ArrayList<>();
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+
         List<String> sexs = new ArrayList<>();
-        if(StringUtils.hasText(sex)){
+        if (StringUtils.hasText(sex)) {
             sexs.add(sex);
-        }else{
+        } else {
             sexs.add("男");
             sexs.add("女");
         }
         for (WelcomeOrg org : orgs) {
-            for (String sexStr :sexs){
+            for (String sexStr : sexs) {
                 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().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);//总人数
+                if (sqlDataCs != null && sqlDataCs.size() > 0) {
+                    //int totalData = sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
+                    //btv.setTotal(totalData);//总人数
                     int bedTotals = 0;
-                    for (BedSqlTotalVo d:sqlDataCs) {
+                    for (BedSqlTotalVo d : sqlDataCs) {
                         bedTotals = bedTotals + d.getTotalBed();
                     }
                     btv.setAssignedBed(bedTotals);//已分配床
                     btv.setAssignedDormitory(sqlDataCs.size());//已分配寝室
-                    int buildCount = (int)sqlDataCs.stream().map(BedSqlTotalVo::getBuild).distinct().count();
+                    int buildCount = (int) sqlDataCs.stream().map(BedSqlTotalVo::getBuild).distinct().count();
                     btv.setAssignedBuild(buildCount);//已分配楼栋
-                }else{
-                    btv.setTotal(0);
+                } else {
+                    //btv.setTotal(0);
                     btv.setAssignedBed(0);//已分配床
                     btv.setAssignedDormitory(0);//已分配寝室
                     btv.setAssignedBuild(0);//已分配楼栋
                 }
+                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege().equals(org.getName()) && e.getSex().equals(sexStr)).findFirst();
+                if (ostudent != null && ostudent.isPresent()) {
+                    btv.setTotal(ostudent.get().getTotal());
+                } else {
+                    btv.setTotal(0);
+                }
                 result.add(btv);
             }
         }
@@ -184,37 +204,46 @@ public class CensusController implements CensusControllerAPI {
         List<SleepTotalVo> result = new ArrayList<>();
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+
         List<String> sexs = new ArrayList<>();
-        if(StringUtils.hasText(sex)){
+        if (StringUtils.hasText(sex)) {
             sexs.add(sex);
-        }else{
+        } else {
             sexs.add("男");
             sexs.add("女");
         }
         for (WelcomeOrg org : orgs) {
-            for (String sexStr :sexs){
+            for (String sexStr : sexs) {
                 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().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().equals(sexStr)).collect(Collectors.toList());
-                if(sqlDataCs != null && sqlDataCs.size() > 0){
-                    int toalData =sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
+                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();
                     int totalBed = sqlDataCs.get(0).getTotalBed() == null ? 0 : sqlDataCs.get(0).getTotalBed();
-                    btv.setTotalData(toalData);//总人数
+                    //btv.setTotalData(toalData);//总人数
                     btv.setSleeper(sleeper);//已入住人数
                     btv.setUnSleeper((toalData - sleeper) < 0 ? 0 : (toalData - sleeper));//未入住人数
                     btv.setTotalBed(totalBed);//总床数
                     btv.setSleepBed(sleeper);//已入住床位数
                     btv.setUnSleepBed((totalBed - sleeper) < 0 ? 0 : (totalBed - sleeper));//未入住床位数
-                }else{
-                    btv.setTotalData(0);//总人数
+                } else {
+                    //btv.setTotalData(0);//总人数
                     btv.setSleeper(0);//已入住人数
                     btv.setUnSleeper(0);//未入住人数
                     btv.setTotalBed(0);//总床数
                     btv.setSleepBed(0);//已入住床位数
                     btv.setUnSleepBed(0);//未入住床位数
                 }
+
                 result.add(btv);
             }
         }
@@ -226,32 +255,40 @@ public class CensusController implements CensusControllerAPI {
         List<SleepTotalVo> result = new ArrayList<>();
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeId);
         List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+
         List<String> sexs = new ArrayList<>();
-        if(StringUtils.hasText(sex)){
+        if (StringUtils.hasText(sex)) {
             sexs.add(sex);
-        }else{
+        } else {
             sexs.add("男");
             sexs.add("女");
         }
 
         for (WelcomeOrg org : orgs) {
-            for (String sexStr :sexs){
+            for (String sexStr : sexs) {
                 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().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().equals(sexStr)).collect(Collectors.toList());
-                if(sqlDataCs != null && sqlDataCs.size() > 0){
-                    int toalData =sqlDataCs.get(0).getTotalData() == null ? 0 : sqlDataCs.get(0).getTotalData();
+                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();
                     int totalBed = sqlDataCs.get(0).getTotalBed() == null ? 0 : sqlDataCs.get(0).getTotalBed();
-                    btv.setTotalData(toalData);//总人数
+                    //btv.setTotalData(toalData);//总人数
                     btv.setSleeper(sleeper);//已入住人数
                     btv.setUnSleeper((toalData - sleeper) < 0 ? 0 : (toalData - sleeper));//未入住人数
                     btv.setTotalBed(totalBed);//总床数
                     btv.setSleepBed(sleeper);//已入住床位数
                     btv.setUnSleepBed((totalBed - sleeper) < 0 ? 0 : (totalBed - sleeper));//未入住床位数
-                }else{
-                    btv.setTotalData(0);//总人数
+                } else {
+                    //btv.setTotalData(0);//总人数
                     btv.setSleeper(0);//已入住人数
                     btv.setUnSleeper(0);//未入住人数
                     btv.setTotalBed(0);//总床数

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

@@ -343,7 +343,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
 
     @Override
     public CommonResult downloadBuildExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/学生信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/楼栋信息管理.xlsx");
     }
 
     @Override

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

@@ -3,10 +3,7 @@ package com.template.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.template.model.pojo.WelcomeStudent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.StudentRegisterVo;
-import com.template.model.vo.StudentSexRatioVo;
-import com.template.model.vo.StudentTrafficVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -31,4 +28,6 @@ public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
     List<StudentTrafficVo> studentTraffic();
 
     List<StudentSexRatioVo> studentSexRatio();
+
+    List<StudentTotalVo> queryStudentTotal();
 }

src/main/java/com/template/model/vo/StudentTotalVo.java

@@ -0,0 +1,22 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class StudentTotalVo {
+    //学院
+    private String college;
+
+    //性别
+    private String sex;
+
+    //总数
+    private Integer total;
+
+}

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

@@ -58,4 +58,6 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
     List<WelcomeStudent> getStudent(CheckInVo checkInVo);
 
     WelcomeStudent getDataByNum(String admissNum);
+
+    List<StudentTotalVo> queryStudentTotal();
 }

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

@@ -193,4 +193,9 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
         return (cardIds != null && cardIds.size() > 0) ? result : null;
     }
 
+    @Override
+    public List<StudentTotalVo> queryStudentTotal() {
+        List<StudentTotalVo> result = welcomeStudentMapper.queryStudentTotal();
+        return result;
+    }
 }

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

@@ -102,7 +102,8 @@
     </resultMap>
 
     <select id="queryBedSqlList" resultType="com.template.model.vo.BedSqlTotalVo" resultMap="queryBedSqlMap">
-        select (select sum(1) as total from welcome_student where deleted = 0 and college = wb.college and iden_type = 1 and sex = wb.sex) as totalData,
+--         select (select sum(1) as total from welcome_student where deleted = 0 and college = wb.college and iden_type = 1 and sex = wb.sex) as totalData,
+        select 0 as totalData,
         SUM(1) as totalBed,college,sex,build,dormitory
         from welcome_bed wb
         where wb.deleted = 0 and wb.college is not null and wb.college != ''
@@ -127,7 +128,8 @@
     <select id="queryTotalSqlList" resultType="com.template.model.vo.SleepSqlTotalVo" resultMap="queryTotalSqlMap">
         select SUM(1) as totalBed,
         (select SUM(1) as total from welcome_bed where deleted = 0 and `name` is not null and name != '' and college = wb.college and sex = wb.sex) as sleeper,
-        (select sum(1) as total from welcome_student where deleted = 0 and college = wb.college and iden_type = 1 and sex = wb.sex) as totalData,wb.college,wb.sex from welcome_bed wb
+--         (select sum(1) as total from welcome_student where deleted = 0 and college = wb.college and iden_type = 1 and sex = wb.sex) as totalData,wb.college,wb.sex from welcome_bed wb
+        0 as totalData,wb.college,wb.sex from welcome_bed wb
         where wb.deleted = 0 and wb.college is not null
         <if test="collegeId != null and collegeId != ''">
             and wb.college_id = #{collegeId}

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

@@ -114,4 +114,19 @@
         GROUP BY
             w.college_id
     </select>
+
+
+    <resultMap type="com.template.model.vo.StudentTotalVo" id="queryStudentTotalMap">
+        <result property="total" column="total"/>
+        <result property="college" column="college"/>
+        <result property="sex" column="sex"/>
+    </resultMap>
+
+    <select id="queryStudentTotal" resultType="com.template.model.vo.StudentTotalVo" resultMap="queryStudentTotalMap">
+        select sum(1) as total,college,sex from welcome_student
+        where deleted = 0 and iden_type = 1
+        group by college,sex
+    </select>
+
+
 </mapper>