Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

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/LoginController.java

@@ -229,6 +229,7 @@ public class LoginController implements LoginControllerAPI {
         }
         //根据卡号查询repair_user表中的用户信息
         WelcomeStudent student = welcomeStudentService.getDataByIdcard(id_card);
+        System.out.println("微校授权获取用户信息"+JSON.toJSON(student));
         //取消授权的身份验证 谁都能进
         //if (identity_type != 4 && user == null) {
         //   return CommonResult.fail("非法权限，授权失败");
@@ -268,17 +269,17 @@ public class LoginController implements LoginControllerAPI {
 //            }
         } else {
             //更新微校获取的年纪信息
-            student.setAdmissNum(card_number);
-            student.setName(user_name);
-            student.setPhone(phone);
-            student.setSchool(!StringUtils.hasText(campus) ? "墨轩湖校区" : campus);
-            student.setSchoolId(!StringUtils.hasText(campus) ? 1 : eSchool.stringOf(campus));
-            student.setSex(gender == 1 ? "男" : "女");
+//            student.setAdmissNum(card_number);
+//            student.setName(user_name);
+//            student.setPhone(phone);
+//            student.setSchool(!StringUtils.hasText(campus) ? "墨轩湖校区" : campus);
+//            student.setSchoolId(!StringUtils.hasText(campus) ? 1 : eSchool.stringOf(campus));
+//            student.setSex(gender == 1 ? "男" : "女");
 //            student.setCollege(college);
 //            student.setMajor(profession);
             student.setIdenType(idenType);
             //student.setClassstr(classStr);
-            student.setCardId(id_card);//身份证号
+            //student.setCardId(id_card);//身份证号
 
             if(student.getIdenType().intValue() == 1 && !(student.getIsPay() != null && student.getIsPay().intValue() == 1)){
                 List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(card_number,TimeExchange.getYear());

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

@@ -180,17 +180,17 @@ public class SystemSettingController implements SystemSettingControllerAPI {
             }
         }
 
-        //到站时间段设置 welcome_arrive_setting
-        List<WelcomeArriveSetting> wass = new ArrayList<>();
-        if (iussr.getAsvs() != null && iussr.getAsvs().size() > 0) {
-            for (ArriveSettingVo asv : iussr.getAsvs()) {
-                WelcomeArriveSetting was = new WelcomeArriveSetting();
-                was.setIsCheck(asv.getIsCheck());
-                was.setStartTime(asv.getStartTime());
-                was.setEndTime(asv.getEndTime());
-                wass.add(was);
-            }
-        }
+//        //到站时间段设置 welcome_arrive_setting
+//        List<WelcomeArriveSetting> wass = new ArrayList<>();
+//        if (iussr.getAsvs() != null && iussr.getAsvs().size() > 0) {
+//            for (ArriveSettingVo asv : iussr.getAsvs()) {
+//                WelcomeArriveSetting was = new WelcomeArriveSetting();
+//                was.setIsCheck(asv.getIsCheck());
+//                was.setStartTime(asv.getStartTime());
+//                was.setEndTime(asv.getEndTime());
+//                wass.add(was);
+//            }
+//        }
 
         try {
             boolean iuS = welcomeSettingService.saveOrUpdate(result);
@@ -220,15 +220,15 @@ public class SystemSettingController implements SystemSettingControllerAPI {
                 }
             }
 
-            if (wass != null && wass.size() > 0) {
-                int deleteAll = welcomeArriveSettingService.deleteAll();
-
-                boolean saveBatch = welcomeArriveSettingService.saveBatch(wass);
-                if (!saveBatch) {
-                    logger.error("添加抵达时间段设置信息失败，参数：" + JSON.toJSON(wass));
-                    throw new Exception("添加失败！");
-                }
-            }
+//            if (wass != null && wass.size() > 0) {
+//                int deleteAll = welcomeArriveSettingService.deleteAll();
+//
+//                boolean saveBatch = welcomeArriveSettingService.saveBatch(wass);
+//                if (!saveBatch) {
+//                    logger.error("添加抵达时间段设置信息失败，参数：" + JSON.toJSON(wass));
+//                    throw new Exception("添加失败！");
+//                }
+//            }
 
         } catch (Exception e) {
             logger.error(e.getMessage());

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

@@ -636,7 +636,6 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 if (!(StringUtils.hasText(fv.getName()) && StringUtils.hasText(fv.getPhone()) && StringUtils.hasText(fv.getWorkUnit()) && StringUtils.hasText(fv.getFamilyShip()))) {
                     return CommonResult.fail("家庭成员信息不能为空！");
                 }
-
                 WelcomeFamily wf = new WelcomeFamily();
                 wf.setName(fv.getName());
                 wf.setPhone(fv.getPhone());
@@ -654,7 +653,6 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 if (!(StringUtils.hasText(av.getName()) && StringUtils.hasText(av.getPhone()))) {
                     return CommonResult.fail("家庭成员信息不能为空！");
                 }
-
                 WelcomeAccompany wa = new WelcomeAccompany();
                 wa.setName(av.getName());
                 wa.setPhone(av.getPhone());
@@ -731,6 +729,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
             System.out.println("信息采集2");
             if (wfs != null && wfs.size() > 0) {
+                int deleteF = welcomeFamilyService.deleteWelcomeFamilyByCard(ws.getCardId());
                 boolean resultWf = welcomeFamilyService.saveBatch(wfs);
                 System.out.println("信息采集1.3");
                 if (!resultWf) {
@@ -743,6 +742,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
             System.out.println("信息采集3");
             if (was != null && was.size() > 0) {
+                int deleteF = welcomeAccompanyService.deleteWelcomeAccompanyByCard(ws.getCardId());
                 boolean resultWa = welcomeAccompanyService.saveBatch(was);
                 System.out.println("信息采集1.5");
                 if (!resultWa) {
@@ -1489,7 +1489,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 //        BigDecimal total = new BigDecimal(enrollmentTotal);
 //        BigDecimal bedTotal = new BigDecimal(checkInBedTotal);
 //        BigDecimal bigDecimal = bedTotal.divide(total).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
-        String registrationRate = String.format("%.2f",(double)(checkInBedTotal/enrollmentTotal) * 100);
+        Double result = ((double)checkInBedTotal / enrollmentTotal) * 100;
+        String registrationRate = String.format("%.2f", result);
 
 
         LocalDateTime start = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
@@ -1626,7 +1627,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Override
     public CommonResult queryStudentInfo(String admissNum) {
         WelcomeStudent ws = welcomeStudentService.getDataByNum(admissNum);
-        if(ws == null){
+        if (ws == null) {
             return CommonResult.fail("当前学生信息已失效，查询失败");
         }
         List<PayDetailVO> pdvs = new ArrayList<>();
@@ -1678,9 +1679,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         } else {
             ws.setIsPay(0);
         }
-        if(!(ws.getIsPay() != null && ws.getIsPay().intValue() == 1)){
+        if (!(ws.getIsPay() != null && ws.getIsPay().intValue() == 1)) {
             int updateResult = welcomeStudentService.updateWelcomeStudent(ws);
-            if(updateResult < 0){
+            if (updateResult < 0) {
                 return CommonResult.fail("查询支付信息失败");
             }
         }

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>