更新

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

@@ -31,7 +31,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/queryPageStudents")
     @ApiOperation(value = "学生信息分页数据", notes = "学生信息分页数据", httpMethod = "GET")
-    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
+    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber);
 
     @GetMapping(value = "/queryStudentDetail")
     @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
@@ -55,12 +55,12 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "welcomeStudentExport")
     @ApiOperation(value = "导出学生信息数据", notes = "导出学生信息数据", httpMethod = "GET")
-    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
+    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber);
 
 
     @GetMapping(value = "/studentOverview")
     @ApiOperation(value = "学生总览", notes = "学生总览", httpMethod = "GET")
-    CommonResult studentOverview();
+    CommonResult studentOverview(Integer collegeId);
 
     @GetMapping(value = "/studentRegister")
     @ApiOperation(value = "新生报到情况", notes = "新生报到情况", httpMethod = "GET")
@@ -68,7 +68,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/studentTraffic")
     @ApiOperation(value = "学生交通方式", notes = "学生交通方式", httpMethod = "GET")
-    CommonResult studentTraffic();
+    CommonResult studentTraffic(Integer collegeId);
 
     @GetMapping(value = "/studentSexRatio")
     @ApiOperation(value = "学生性别比例", notes = "学生性别比例", httpMethod = "GET")
@@ -92,5 +92,5 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/levelRegister")
     @ApiOperation(value = "层次报到情况", notes = "层次报到情况", httpMethod = "GET")
-    CommonResult levelRegister();
+    CommonResult levelRegister(Integer collegeId);
 }

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

@@ -483,7 +483,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageStudents(String userId, int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus, Integer isRegistered,Integer isPay) {
+    public CommonResult queryPageStudents(String userId, int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus, Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber) {
         IPage<StudentPageVo> pages = new Page<>();
         PageUtils<StudentPageVo> result = new PageUtils<>(pages);
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -501,7 +501,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
-        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered,isPay);
+        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered,isPay,isCheck,school,batchValue,carNumber);
         return CommonResult.ok(result);
     }
 
@@ -618,7 +618,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         result.setPayAmount(ws.getPayAmount());
         result.setIsDrive(ws.getIsDrive());
 //        当前学生表里的车牌号为空
-        result.setCarNumber(ws.getCarNumber());
+        WelcomeVisitorVO byCurUser = welcomeVisitorService.getByCurUser(ws.getCardId());
+        if (ObjectUtils.isNotEmpty(byCurUser)) {
+            result.setCarNumber(byCurUser.getCarNumber());
+        }
+
 
         return CommonResult.ok(result);
     }
@@ -1524,7 +1528,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public void welcomeStudentExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus,Integer isRegistered,Integer isPay) {
+    public void welcomeStudentExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber) {
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("学生信息");
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -1543,7 +1547,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
         }
 
-        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus,isRegistered,isPay);
+        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus,isRegistered,isPay,isCheck,school,batchValue,carNumber);
         //导出
 
         Row headerRow = sheet.createRow(0);
@@ -1557,11 +1561,16 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         headerRow.createCell(7).setCellValue("班级");
         headerRow.createCell(8).setCellValue("交通方式");
         headerRow.createCell(9).setCellValue("到站地点");
-        headerRow.createCell(10).setCellValue("陪同人数");
-        headerRow.createCell(11).setCellValue("填报状态");
-        headerRow.createCell(12).setCellValue("应缴金额");
-        headerRow.createCell(13).setCellValue("实付金额");
-        headerRow.createCell(14).setCellValue("宿舍信息");
+        headerRow.createCell(10).setCellValue("车牌号");
+        headerRow.createCell(11).setCellValue("陪同人数");
+        headerRow.createCell(12).setCellValue("填报状态");
+        headerRow.createCell(13).setCellValue("应缴金额");
+        headerRow.createCell(14).setCellValue("实付金额");
+        headerRow.createCell(15).setCellValue("宿舍信息");
+        headerRow.createCell(16).setCellValue("学生手机号");
+        headerRow.createCell(17).setCellValue("家长名称");
+        headerRow.createCell(18).setCellValue("家长手机号");
+
         for (int i = 0; i < result.size(); i++) {
             StudentPageVo studentData = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
@@ -1575,27 +1584,31 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             dataRow.createCell(7).setCellValue(studentData.getClassstr());
             dataRow.createCell(8).setCellValue(studentData.getTrafficMethod());
             dataRow.createCell(9).setCellValue(studentData.getArrive());
-            dataRow.createCell(10).setCellValue(studentData.getAccompanyNum());
-            dataRow.createCell(11).setCellValue(studentData.getFillStatus());
-            dataRow.createCell(12).setCellValue(String.valueOf(studentData.getAmountPayable()));
-            dataRow.createCell(13).setCellValue(String.valueOf(studentData.getPayAmount()));
-            dataRow.createCell(14).setCellValue(studentData.getDormitory());
+            dataRow.createCell(10).setCellValue(studentData.getCarNumber());
+            dataRow.createCell(11).setCellValue(studentData.getAccompanyNum());
+            dataRow.createCell(12).setCellValue(studentData.getFillStatus());
+            dataRow.createCell(13).setCellValue(String.valueOf(studentData.getAmountPayable()));
+            dataRow.createCell(14).setCellValue(String.valueOf(studentData.getPayAmount()));
+            dataRow.createCell(15).setCellValue(studentData.getDormitory());
+            dataRow.createCell(16).setCellValue(studentData.getPhone());
+            dataRow.createCell(17).setCellValue(studentData.getFamilyName());
+            dataRow.createCell(18).setCellValue(studentData.getFamilyPhone());
         }
         // 将工作簿写入文件
         ExcelUtils.excelDownload(workbook, "学生信息.xlsx", response);
     }
 
     @Override
-    public CommonResult studentOverview() {
-
-        int enrollmentTotal=welcomeStudentService.studentTotalCount();
+    public CommonResult studentOverview(Integer collegeId) {
+//        获取学生总数
+        int enrollmentTotal=welcomeStudentService.studentTotalCount(collegeId);
         //        录取总数
         //        LambdaQueryWrapper<WelcomeStudent> queryWrapper=new LambdaQueryWrapper<>();
         //        queryWrapper.eq(WelcomeStudent::getIdenType,1);
 //        int enrollmentTotal = 8085;//welcomeStudentService.count(queryWrapper);
 
         //        缴费人数
-        int payCount = welcomeStudentService.payCount();
+        int payCount = welcomeStudentService.payCount(collegeId);
         //        缴费率
         Double rate = ((double) payCount / enrollmentTotal) * 100;
         String payRate = String.format("%.2f", rate);
@@ -1604,7 +1617,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //        已入住寝室数
         LambdaQueryWrapper<WelcomeBed> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(WelcomeBed::getIsCheck, 1)
-                .eq(WelcomeBed::getRetentionState, 1);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .eq(ObjectUtils.isNotEmpty(collegeId),WelcomeBed::getCollegeId,collegeId);
         int checkInBedTotal = welcomeBedService.count(wrapper);
 
         //        报到率
@@ -1647,7 +1661,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Override
     public CommonResult studentRegister(Integer collegeId) {
 //        学生总数
-        int enrollmentTotal=welcomeStudentService.studentTotalCount();
+        int enrollmentTotal=welcomeStudentService.studentTotalCount(collegeId);
         //        获取总数
         Integer count = welcomeStudentService.totalCount(collegeId);
 //        获取比例
@@ -1670,8 +1684,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult studentTraffic() {
-        List<StudentTrafficVo> vos = welcomeStudentService.studentTraffic();
+    public CommonResult studentTraffic(Integer collegeId) {
+        List<StudentTrafficVo> vos = welcomeStudentService.studentTraffic(collegeId);
         return CommonResult.ok(vos);
     }
 
@@ -1934,12 +1948,12 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult levelRegister() {
-//        学生总数
-        int enrollmentTotal=welcomeStudentService.studentTotalCount();
+    public CommonResult levelRegister(Integer collegeId) {
+//        获取学生总数
+        int enrollmentTotal=welcomeStudentService.studentTotalCount(collegeId);
 
-        //        获取总数
-        Integer count = welcomeStudentService.totalCount(null);
+        //        获取报到总数
+        Integer count = welcomeStudentService.totalCount(collegeId);
 //        获取比例
         Double result = ((double) count / enrollmentTotal) * 100;
         String rate = String.format("%.2f", result);
@@ -1953,14 +1967,14 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         String zsb="专升本";
         String zk="专科";
 
-//        获取本科人数
-        Integer bkCount = welcomeStudentService.getLevelTotalCount(bk);
-//        获取专升本人数
-        Integer zsbCount = welcomeStudentService.getLevelTotalCount(zsb);
-//        获取专科人数
-        Integer zkCount = welcomeStudentService.getLevelTotalCount(zk);
+//        获取总本科人数
+        Integer bkCount = welcomeStudentService.getLevelTotalCount(bk,collegeId);
+//        获取总专升本人数
+        Integer zsbCount = welcomeStudentService.getLevelTotalCount(zsb,collegeId);
+//        获取总专科人数
+        Integer zkCount = welcomeStudentService.getLevelTotalCount(zk,collegeId);
 
-        List<StudentRegisterVo> vos = welcomeStudentService.levelRegister();
+        List<StudentRegisterVo> vos = welcomeStudentService.levelRegister(collegeId);
         HashMap<String, StudentRegisterVo> map = new HashMap<>();
         for (StudentRegisterVo studentRegisterVo : vos) {
             Integer count1 = studentRegisterVo.getCount();

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

@@ -65,4 +65,16 @@ public class StudentPageVo {
     @ApiModelProperty(value = "是否已报到")
     private Integer isRegistered;
 
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
+    @ApiModelProperty(value = "学生手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "家长名称")
+    private String familyName;
+
+    @ApiModelProperty(value = "家长手机号")
+    private String familyPhone;
+
 }

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

@@ -31,13 +31,13 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     WelcomeStudent getDataByIdcard(String cardId);
 
-    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
+    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber);
 
     WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId);
 
     List<WelcomeStudent> queryStudentByCardId(List<String> cardIds);
 
-    List<StudentPageVo> queryStudentList(List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
+    List<StudentPageVo> queryStudentList(List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber);
 
     WelcomeStudent queryStudentInfo(Integer collegeId, Integer majorId, Integer classstrId,String admissNum);
 
@@ -45,7 +45,7 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     List<StudentRegisterVo> studentRegister();
 
-    List<StudentTrafficVo> studentTraffic();
+    List<StudentTrafficVo> studentTraffic(Integer collegeId);
 
     Integer genderCount(String gender);
 
@@ -53,7 +53,7 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     Integer totalCount(Integer collegeId);
 
-    int payCount();
+    int payCount(Integer collegeId);
 
     List<WelcomeStudent> getStudent(CheckInVo checkInVo);
 
@@ -77,9 +77,9 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     List<StudentRegisterVo> studentMajorRegister(Integer collegeId);
 
-    List<StudentRegisterVo> levelRegister();
+    List<StudentRegisterVo> levelRegister(Integer collegeId);
 
-    Integer getLevelTotalCount(String batchValue);
+    Integer getLevelTotalCount(String batchValue,Integer collegeId);
 
-    int studentTotalCount();
+    int studentTotalCount(Integer collegeId);
 }

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

@@ -80,18 +80,18 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay) {
+    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber) {
         Page<StudentPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay);
+        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay,isCheck,school,batchValue,carNumber);
         return new PageUtils(result);
     }
 
     @Override
-    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay) {
+    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay,Integer isCheck,String school,String batchValue,Integer carNumber) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay,isCheck,school,batchValue,carNumber);
         return result;
     }
 
@@ -120,8 +120,8 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public List<StudentTrafficVo> studentTraffic() {
-        return welcomeStudentMapper.studentTraffic();
+    public List<StudentTrafficVo> studentTraffic(Integer collegeId) {
+        return welcomeStudentMapper.studentTraffic(collegeId);
     }
 
     @Override
@@ -150,9 +150,11 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public int payCount() {
+    public int payCount(Integer collegeId) {
         QueryWrapper<WelcomeStudent> wss = new QueryWrapper<>();
-        wss.gt("pay_amount",0);//交了钱就算已交付
+//        wss.gt("pay_amount",0);//交了钱就算已交付
+        wss.eq("is_pay",1)
+                .eq(ObjectUtils.isNotEmpty(collegeId),"college_id",collegeId);//
         Integer count = welcomeStudentMapper.selectCount(wss);
         return count;
     }
@@ -230,23 +232,25 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public List<StudentRegisterVo> levelRegister() {
-        return welcomeStudentMapper.levelRegister();
+    public List<StudentRegisterVo> levelRegister(Integer collegeId) {
+        return welcomeStudentMapper.levelRegister(collegeId);
     }
 
     @Override
-    public Integer getLevelTotalCount(String batchValue) {
+    public Integer getLevelTotalCount(String batchValue,Integer collegeId) {
         LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(WelcomeStudent::getIdenType,1)
-                .eq(WelcomeStudent::getBatchValue,batchValue);
+                .eq(WelcomeStudent::getBatchValue,batchValue)
+                .eq(ObjectUtils.isNotEmpty(collegeId),WelcomeStudent::getCollegeId,collegeId);
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }
 
     @Override
-    public int studentTotalCount() {
+    public int studentTotalCount(Integer collegeId) {
         LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getIdenType,1);
+        wrapper.eq(WelcomeStudent::getIdenType,1)
+                .eq(ObjectUtils.isNotEmpty(collegeId),WelcomeStudent::getCollegeId,collegeId);
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }

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

@@ -23,9 +23,19 @@
         select (select count(id) from welcome_accompany where student_card = ws.card_id and deleted = 0) as accompanyNum,
         ws.id,ws.admiss_num,ws.name,ws.card_id,ws.college,ws.major,ws.classstr,
         ws.traffic_method,ws.arrive,ws.amount_payable,ws.pay_amount,ws.fill_status,
-        CONCAT(wsd.build, '-', wsd.dormitory, '-', wsd.number) as dormitory,ws.sex,ws.is_registered as isRegistered
+        CONCAT(wsd.build, '-', wsd.dormitory, '-', wsd.number) as dormitory,ws.sex,ws.is_registered as isRegistered,wv.car_number as carNumber,ws.phone,wf.`name` as familyName,
+        wf.phone as familyPhone
         from welcome_student ws
         left join welcome_bed wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
+        left join welcome_visitor wv on wv.deleted =0 and wv.student_card = ws.card_id
+        left join (SELECT
+        f.*
+        FROM
+        welcome_family f
+        WHERE f.deleted=0
+        GROUP BY
+        f.student_card ) wf ON wf.deleted = 0
+        AND wf.student_card = ws.card_id
         where ws.deleted = 0
         <if test="collegeIds != null and collegeIds.size() > 0">
             and ws.college_id in
@@ -59,9 +69,35 @@
         <if test="isPay != null">
             and ws.is_pay = #{isPay}
         </if>
+        <if test="isCheck != null">
+            <if test="isCheck == 1">
+                and wsd.is_check = #{isCheck}
+            </if>
+            <if test="isCheck == 0">
+                and wsd.is_check is null
+            </if>
+        </if>
+        <if test="school != null and school != ''">
+            and ws.school = #{school}
+        </if>
+        <if test="batchValue != null and batchValue != ''">
+            and ws.batch_value = #{batchValue}
+        </if>
+        <if test="carNumber != null">
+            <if test="carNumber == 1">
+                and wv.car_number is not null
+            </if>
+            <if test="carNumber == 0">
+                and wv.car_number is null
+            </if>
+        </if>
         and ws.iden_type != 2
         order by ws.update_time desc
     </select>
+
+
+
+
     <select id="studentRegister" resultType="com.template.model.vo.StudentRegisterVo">
         SELECT count(ws.id) AS count,
 	           wo.`name`
@@ -85,6 +121,9 @@
             ws.deleted = 0
           AND ws.iden_type=1
           AND ws.fill_status = '已填报'
+        <if test="collegeId != null">
+            and ws.college_id = #{collegeId}
+        </if>
         GROUP BY
             traffic_method
     </select>
@@ -171,6 +210,9 @@
             ws.deleted = 0
           AND ws.iden_type=1
           AND ws.is_registered = 1
+         <if test="collegeId != null">
+            and ws.college_id = #{collegeId}
+         </if>
         GROUP BY
             ws.batch_value
     </select>