添加年份查询

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

@@ -12,6 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 
 
 @RequestMapping("/api/census")
@@ -20,17 +21,17 @@ public interface CensusControllerAPI {
 
     @GetMapping(value = "/queryBedTotal")
     @ApiOperation(value = "床位分配统计", notes = "床位分配统计", httpMethod = "GET")
-    CommonResult queryBedTotal(@RequestAttribute String userId,Integer collegeId, String sex);
+    CommonResult queryBedTotal(@RequestAttribute String userId, Integer collegeId, String sex, Integer yearId) throws ParseException;
 
     @GetMapping(value = "bedTotalExport")
     @ApiOperation(value = "导出床位分配统计数据", notes = "导出床位分配统计数据", httpMethod = "GET")
-    void bedTotalExport(HttpServletResponse response, @RequestAttribute String userId,Integer collegeId, String sex);
+    void bedTotalExport(HttpServletResponse response, @RequestAttribute String userId, Integer collegeId, String sex, Integer yearId) throws ParseException;
 
     @GetMapping(value = "/queryCheckTotal")
     @ApiOperation(value = "床位入住统计", notes = "床位入住统计", httpMethod = "GET")
-    CommonResult queryCheckTotal(@RequestAttribute String userId,Integer collegeId, String sex);
+    CommonResult queryCheckTotal(@RequestAttribute String userId, Integer collegeId, String sex, Integer yearId) throws ParseException;
 
     @GetMapping(value = "checkTotalExport")
     @ApiOperation(value = "导出床位入住统计数据", notes = "导出床位入住统计数据", httpMethod = "GET")
-    void checkTotalExport(HttpServletResponse response, @RequestAttribute String userId,Integer collegeId, String sex);
+    void checkTotalExport(HttpServletResponse response, @RequestAttribute String userId, Integer collegeId, String sex, Integer yearId) throws ParseException;
 }

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

@@ -32,7 +32,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/queryPageBeds")
     @ApiOperation(value = "床位信息分页数据", notes = "床位信息分页数据", httpMethod = "GET")
-    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState,Integer accountId);
+    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState, Integer accountId);
 
     @GetMapping(value = "/deleteBedInfo")
     @ApiOperation(value = "删除床位信息", notes = "删除床位信息", httpMethod = "GET")
@@ -48,7 +48,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "welcomeBedExport")
     @ApiOperation(value = "导出床位信息数据", notes = "导出床位信息数据", httpMethod = "GET")
-    void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState,Integer accountId);
+    void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState, Integer accountId);
 
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
@@ -80,7 +80,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/bedGroup")
     @ApiOperation(value = "根据学院分组", notes = "根据学院分组", httpMethod = "GET")
-    CommonResult bedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId);
+    CommonResult bedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId);
 
     @PostMapping(value = "/changeBed")
     @ApiOperation(value = "换床", notes = "换床", httpMethod = "POST")
@@ -88,7 +88,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/checkInBedGroup")
     @ApiOperation(value = "入住床位分组", notes = "入住床位分组", httpMethod = "GET")
-    CommonResult checkInBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer bedId,Integer collegeId);
+    CommonResult checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer bedId, Integer collegeId);
 
     @PostMapping(value = "/replaceBed")
     @ApiOperation(value = "床位对调", notes = "床位对调", httpMethod = "POST")
@@ -96,48 +96,48 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/studentAccommodationPage")
     @ApiOperation(value = "学生住宿分页展示", notes = "学生住宿分页展示", httpMethod = "GET")
-    CommonResult studentAccommodationPage(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name,Integer accountId);
+    CommonResult studentAccommodationPage(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId, Integer yearId) throws ParseException;
 
     @GetMapping(value = "/studentAccommodationListExport")
     @ApiOperation(value = "导出学生住宿信息", notes = "导出学生住宿信息", httpMethod = "GET")
-    void studentAccommodationListExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name,Integer accountId);
+    void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId, Integer yearId) throws ParseException;
 
     @GetMapping(value = "/changeBuildGroup")
     @ApiOperation(value = "换床楼栋分组", notes = "学院寝室分组", httpMethod = "GET")
-    CommonResult changeBuildGroup(Integer schoolId,Integer collegeId,String sex);
+    CommonResult changeBuildGroup(Integer schoolId, Integer collegeId, String sex);
 
     @GetMapping(value = "/changeDormitoryGroup")
     @ApiOperation(value = "换床寝室分组", notes = "换床寝室分组", httpMethod = "GET")
-    CommonResult changeDormitoryGroup(Integer schoolId,Integer buildId,Integer collegeId,String sex);
+    CommonResult changeDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex);
 
     @GetMapping(value = "/changeBedGroup")
     @ApiOperation(value = "换床床位分组", notes = "换床床位分组", httpMethod = "GET")
-    CommonResult changeBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,String sex);
+    CommonResult changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex);
 
 
     @GetMapping(value = "/replaceBuildGroup")
     @ApiOperation(value = "换床楼栋分组", notes = "换床楼栋分组", httpMethod = "GET")
-    CommonResult replaceBuildGroup(Integer schoolId,Integer collegeId,String sex);
+    CommonResult replaceBuildGroup(Integer schoolId, Integer collegeId, String sex);
 
     @GetMapping(value = "/replaceDormitoryGroup")
     @ApiOperation(value = "换床寝室分组", notes = "换床寝室分组", httpMethod = "GET")
-    CommonResult replaceDormitoryGroup(Integer schoolId,Integer buildId,Integer collegeId,String sex);
+    CommonResult replaceDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex);
 
     @GetMapping(value = "/replaceBedGroup")
     @ApiOperation(value = "换床床位分组", notes = "换床床位分组", httpMethod = "GET")
-    CommonResult replaceBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,String sex);
+    CommonResult replaceBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex);
 
 
     @GetMapping(value = "/hBuildGroup")
     @ApiOperation(value = "移动端楼栋分组", notes = "学院寝室分组", httpMethod = "GET")
-    CommonResult hBuildGroup(Integer schoolId,Integer collegeId,Integer majorId,Integer classstrid,String sex);
+    CommonResult hBuildGroup(Integer schoolId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
 
     @GetMapping(value = "/hDormitoryGroup")
     @ApiOperation(value = "移动端寝室分组", notes = "移动端寝室分组", httpMethod = "GET")
-    CommonResult hDormitoryGroup(Integer schoolId,Integer buildId,Integer collegeId,Integer majorId,Integer classstrid,String sex);
+    CommonResult hDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
 
     @GetMapping(value = "/hBedGroup")
     @ApiOperation(value = "移动端床位分组", notes = "移动端床位分组", httpMethod = "GET")
-    CommonResult hBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId,Integer classstrid,String sex);
+    CommonResult hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
 
 }

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,Integer isCheck,String school,String batchValue,Integer carNumber);
+    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,Integer yearId) throws ParseException;
 
     @GetMapping(value = "/queryStudentDetail")
     @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
@@ -55,28 +55,28 @@ 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,Integer isCheck,String school,String batchValue,Integer carNumber);
+    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,Integer yearId) throws ParseException;
 
 
     @GetMapping(value = "/studentOverview")
     @ApiOperation(value = "学生总览", notes = "学生总览", httpMethod = "GET")
-    CommonResult studentOverview(Integer collegeId);
+    CommonResult studentOverview(Integer collegeId, Integer yearId) throws ParseException;
 
     @GetMapping(value = "/studentRegister")
     @ApiOperation(value = "新生报到情况", notes = "新生报到情况", httpMethod = "GET")
-    CommonResult studentRegister(Integer collegeId);
+    CommonResult studentRegister(Integer collegeId, Integer yearId) throws ParseException;
 
     @GetMapping(value = "/studentTraffic")
     @ApiOperation(value = "学生交通方式", notes = "学生交通方式", httpMethod = "GET")
-    CommonResult studentTraffic(Integer collegeId);
+    CommonResult studentTraffic(Integer collegeId, Integer yearId) throws ParseException;
 
     @GetMapping(value = "/studentSexRatio")
     @ApiOperation(value = "学生性别比例", notes = "学生性别比例", httpMethod = "GET")
-    CommonResult studentSexRatio();
+    CommonResult studentSexRatio(Integer yearId) throws ParseException;
 
     @GetMapping(value = "/studentStay")
     @ApiOperation(value = "学生住宿情况", notes = "学生住宿情况", httpMethod = "GET")
-    CommonResult studentStay();
+    CommonResult studentStay(Integer yearId) throws ParseException;
 
     @GetMapping(value = "/queryStudentByToken")
     @ApiOperation(value = "学生住宿情况", notes = "学生住宿情况", httpMethod = "GET")
@@ -92,5 +92,5 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/levelRegister")
     @ApiOperation(value = "层次报到情况", notes = "层次报到情况", httpMethod = "GET")
-    CommonResult levelRegister(Integer collegeId);
+    CommonResult levelRegister(Integer collegeId, Integer yearId) throws ParseException;
 }

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

@@ -2,6 +2,7 @@ package com.template.controller;
 
 import com.template.api.CensusControllerAPI;
 import com.template.common.utils.ExcelUtils;
+import com.template.common.utils.TimeExchange;
 import com.template.model.pojo.WelcomeAccount;
 import com.template.model.pojo.WelcomeOrg;
 import com.template.model.result.CommonResult;
@@ -19,6 +20,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -56,7 +58,25 @@ public class CensusController implements CensusControllerAPI {
     // where wb.deleted = 0 and wb.college is not null and wb.college != ''
     // group by wb.college,wb.sex,wb.build,wb.dormitory
     @Override
-    public CommonResult queryBedTotal(String userId, Integer collegeId, String sex) {
+    public CommonResult queryBedTotal(String userId, Integer collegeId, String sex, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         List<BedTotalVo> result = new ArrayList<>();
 
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -64,18 +84,18 @@ public class CensusController implements CensusControllerAPI {
             return CommonResult.fail("当前账户已失效，无权限查看");
         }
         List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
-        if(collegeId != null && collegeId.intValue() > 0){
+        if (collegeId != null && collegeId.intValue() > 0) {
             if (!collegeIds.contains(String.valueOf(collegeId))) {
                 return CommonResult.ok(result);
-            }else {
+            } else {
                 collegeIds = new ArrayList<>();
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
 
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
-        List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
-        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+        List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex, nstartTime, nendTime);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal(nstartTime, nendTime);
 
         List<String> sexs = new ArrayList<>();
         if (StringUtils.hasText(sex)) {
@@ -89,7 +109,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()!= null && 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);//总人数
@@ -122,7 +142,25 @@ public class CensusController implements CensusControllerAPI {
     }
 
     @Override
-    public void bedTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex) {
+    public void bedTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         List<BedTotalVo> result = new ArrayList<>();
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("床位分配统计");
@@ -132,19 +170,19 @@ public class CensusController implements CensusControllerAPI {
             ExcelUtils.excelDownload(workbook, "床位分配统计.xlsx", response);
         }
         List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
-        if(collegeId != null && collegeId.intValue() > 0){
+        if (collegeId != null && collegeId.intValue() > 0) {
             if (!collegeIds.contains(String.valueOf(collegeId))) {
 
                 ExcelUtils.excelDownload(workbook, "床位分配统计.xlsx", response);
-            }else {
+            } else {
                 collegeIds = new ArrayList<>();
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
 
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
-        List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex);
-        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+        List<BedSqlTotalVo> sqlDatas = welcomeBedService.queryBedSqlList(collegeId, sex, nstartTime, nendTime);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal(nstartTime, nendTime);
 
         List<String> sexs = new ArrayList<>();
         if (StringUtils.hasText(sex)) {
@@ -158,7 +196,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()!= null && 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);//总人数
@@ -176,7 +214,7 @@ public class CensusController implements CensusControllerAPI {
                     btv.setAssignedDormitory(0);//已分配寝室
                     btv.setAssignedBuild(0);//已分配楼栋
                 }
-                Optional<StudentTotalVo> ostudent = students.stream().filter(e -> e.getCollege()!= null && 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 {
@@ -223,25 +261,44 @@ public class CensusController implements CensusControllerAPI {
     //    where wb.deleted = 0 and wb.college is not null
     //    group by wb.college,wb.sex
     @Override
-    public CommonResult queryCheckTotal(String userId, Integer collegeId, String sex) {
+    public CommonResult queryCheckTotal(String userId, Integer collegeId, String sex, Integer yearId) throws ParseException {
+
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         List<SleepTotalVo> result = new ArrayList<>();
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
         if (wa == null) {
             return CommonResult.fail("当前账户已失效，无权限查看");
         }
         List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
-        if(collegeId != null && collegeId.intValue() > 0){
+        if (collegeId != null && collegeId.intValue() > 0) {
             if (!collegeIds.contains(String.valueOf(collegeId))) {
                 return CommonResult.ok(result);
-            }else {
+            } else {
                 collegeIds = new ArrayList<>();
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
 
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
-        List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
-        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+        List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex, nstartTime, nendTime);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal(nstartTime, nendTime);
 
         List<String> sexs = new ArrayList<>();
         if (StringUtils.hasText(sex)) {
@@ -255,13 +312,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()!= null && 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()!= null && 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();
@@ -288,7 +345,25 @@ public class CensusController implements CensusControllerAPI {
     }
 
     @Override
-    public void checkTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex) {
+    public void checkTotalExport(HttpServletResponse response, String userId, Integer collegeId, String sex, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         List<SleepTotalVo> result = new ArrayList<>();
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("床位入住统计");
@@ -298,19 +373,19 @@ public class CensusController implements CensusControllerAPI {
             ExcelUtils.excelDownload(workbook, "床位入住统计.xlsx", response);
         }
         List<String> collegeIds = Arrays.asList(wa.getCollegeId().split(","));
-        if(collegeId != null && collegeId.intValue() > 0){
+        if (collegeId != null && collegeId.intValue() > 0) {
             if (!collegeIds.contains(String.valueOf(collegeId))) {
 
                 ExcelUtils.excelDownload(workbook, "床位入住统计.xlsx", response);
-            }else {
+            } else {
                 collegeIds = new ArrayList<>();
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
 
         List<WelcomeOrg> orgs = welcomeOrgService.queryColleges(collegeIds);
-        List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex);
-        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal();
+        List<SleepSqlTotalVo> sqlDatas = welcomeBedService.queryTotalSqlList(collegeId, sex, nstartTime, nendTime);
+        List<StudentTotalVo> students = welcomeStudentService.queryStudentTotal(nstartTime, nendTime);
 
         List<String> sexs = new ArrayList<>();
         if (StringUtils.hasText(sex)) {
@@ -325,13 +400,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()!= null && 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()!= null && 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();

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

@@ -11,6 +11,7 @@ import com.template.annotation.AWelcomeTypeLog;
 import com.template.api.WelcomeBedControllerAPI;
 import com.template.common.utils.BeanUtil;
 import com.template.common.utils.ExcelUtils;
+import com.template.common.utils.TimeExchange;
 import com.template.common.utils.paramUtils;
 import com.template.model.enumModel.eFileType;
 import com.template.model.pojo.*;
@@ -940,7 +941,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                     dormitory.setRetentionState(batchOperationVo.getRetentionState());
                 }
                 boolean result = welcomeDormitoryService.updateBatchById(dormitories);
-                if(!result){
+                if (!result) {
                     return CommonResult.fail("批量操作失败");
                 }
             } else {
@@ -955,7 +956,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                     }
                 }
                 boolean result = welcomeDormitoryService.updateBatchById(dormitories);
-                if(!result){
+                if (!result) {
                     return CommonResult.fail("批量操作失败");
                 }
 
@@ -972,7 +973,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     @AWelcomeLevelLog("信息")
     @Transactional(rollbackFor = Exception.class)
     public CommonResult checkIn(CheckInVo checkInVo) throws Exception {
-        logger.info("管理端点击入住："+checkInVo.getAdmissNum());
+        logger.info("管理端点击入住：" + checkInVo.getAdmissNum());
 
         List<WelcomeStudent> list = welcomeStudentService.getStudent(checkInVo);
         if (ObjectUtils.isEmpty(list)) {
@@ -981,8 +982,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             return CommonResult.fail("该录取号有多个学生,请检查修改后在试");
         }
         WelcomeStudent welcomeStudent = list.get(0);
- //        判断当前学生是否已入住
-        WelcomeBed welcomeBed =  welcomeBedService.getBedByAdmissNum(checkInVo.getAdmissNum());
+        //        判断当前学生是否已入住
+        WelcomeBed welcomeBed = welcomeBedService.getBedByAdmissNum(checkInVo.getAdmissNum());
         if (ObjectUtils.isNotEmpty(welcomeBed)) {
             return CommonResult.fail("当前该学生已入住，无法重新入住");
         }
@@ -1233,7 +1234,25 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId) {
+    public CommonResult studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         //        当学院为空
         PageUtils<WelcomeBed> result = null;
         if (ObjectUtils.isEmpty(collegeId)) {
@@ -1248,15 +1267,34 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             for (String s : split) {
                 collegeIds.add(s);
             }
-            result = welcomeBedService.studentAccommodationPageS(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name);
+            result = welcomeBedService.studentAccommodationPageS(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name, nstartTime, nendTime);
         } else {
-            result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name);
+            result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name, nstartTime, nendTime);
         }
         return CommonResult.ok(result);
     }
 
     @Override
-    public void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId) {
+    public void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
+
         //        当学院为空
         List<WelcomeBed> result = null;
         if (ObjectUtils.isEmpty(collegeId)) {
@@ -1271,9 +1309,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             for (String s : split) {
                 collegeIds.add(s);
             }
-            result = welcomeBedService.studentAccommodationListS(schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name);
+            result = welcomeBedService.studentAccommodationListS(schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name, nstartTime, nendTime);
         } else {
-            result = welcomeBedService.studentAccommodationList(schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name);
+            result = welcomeBedService.studentAccommodationList(schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name, nstartTime, nendTime);
         }
 
 

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

@@ -24,6 +24,7 @@ import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.*;
 import com.template.services.*;
+import io.swagger.models.auth.In;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -490,7 +491,26 @@ 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, Integer isCheck, String school, String batchValue, Integer carNumber) {
+    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, Integer yearId) throws ParseException {
+
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         IPage<StudentPageVo> pages = new Page<>();
         PageUtils<StudentPageVo> result = new PageUtils<>(pages);
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -508,7 +528,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
-        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber);
+        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber, nstartTime, nendTime);
         return CommonResult.ok(result);
     }
 
@@ -1547,7 +1567,25 @@ 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, Integer isCheck, String school, String batchValue, Integer carNumber) {
+    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, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("学生信息");
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -1566,7 +1604,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
         }
 
-        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber);
+        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber, nstartTime, nendTime);
         //导出
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -1620,13 +1658,13 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 String arrvieDate = LocalDateTime.parse(studentData.getArrvieDate(), dateTimeFormatter1).toLocalDate().format(dateTimeFormatter2);
                 dataRow.createCell(19).setCellValue(arrvieDate);
             }
-            String registered="未报到";
+            String registered = "未报到";
             if (ObjectUtils.isNotEmpty(studentData.getIsRegistered())) {
                 Integer isRegistered1 = studentData.getIsRegistered();
-                if (isRegistered1==1) {
-                    registered="已报到";
-                }else if (isRegistered1==2){
-                    registered="未报到";
+                if (isRegistered1 == 1) {
+                    registered = "已报到";
+                } else if (isRegistered1 == 2) {
+                    registered = "未报到";
                 }
             }
             dataRow.createCell(20).setCellValue(registered);
@@ -1636,32 +1674,51 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    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(collegeId);
-        //        缴费率
+    public CommonResult studentOverview(Integer collegeId, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
+        //获取学生总数
+        int enrollmentTotal = welcomeStudentService.studentTotalCount(collegeId, nstartTime, nendTime);
+        //录取总数
+        //LambdaQueryWrapper<WelcomeStudent> queryWrapper=new LambdaQueryWrapper<>();
+        //queryWrapper.eq(WelcomeStudent::getIdenType,1);
+        //int enrollmentTotal = 8085;//welcomeStudentService.count(queryWrapper);
+
+        //缴费人数
+        int payCount = welcomeStudentService.payCount(collegeId, nstartTime, nendTime);
+        //缴费率
         Double rate = ((double) payCount / enrollmentTotal) * 100;
         String payRate = String.format("%.2f", rate);
 
 
-        //        已入住寝室数
+        //已入住寝室数
         LambdaQueryWrapper<WelcomeBed> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(WelcomeBed::getIsCheck, 1)
                 .eq(WelcomeBed::getRetentionState, 1)
                 .eq(ObjectUtils.isNotEmpty(collegeId), WelcomeBed::getCollegeId, collegeId);
+        wrapper.between(WelcomeBed::getCreateTime, nstartTime, nendTime);
         int checkInBedTotal = welcomeBedService.count(wrapper);
 
-        //        报到率
-//        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));
+        //报到率
+        //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));
         Double result = ((double) checkInBedTotal / enrollmentTotal) * 100;
         String registrationRate = String.format("%.2f", result);
 
@@ -1671,14 +1728,14 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String startTime = start.format(dateTimeFormatter1);
         String endTime = end.format(dateTimeFormatter1);
-        Integer mVisitorTotal = welcomeVisitorService.countTotal(startTime, endTime, 1);
-        Integer hVisitorTotal = welcomeVisitorService.countTotal(startTime, endTime, 2);
+        Integer mVisitorTotal = welcomeVisitorService.countTotal(startTime, endTime, 1, nstartTime, nendTime);
+        Integer hVisitorTotal = welcomeVisitorService.countTotal(startTime, endTime, 2, nstartTime, nendTime);
 
 
         List<WelcomeSetting> wss = welcomeSettingService.list(null);
-//        墨轩湖总车辆数
+        //墨轩湖总车辆数
         Integer mCarTotal = wss != null && wss.size() > 0 ? (wss.get(0).getMxhCarNum() == null ? 0 : wss.get(0).getMxhCarNum()) : 0;
-//        黄家湖总车辆数
+        //黄家湖总车辆数
         Integer hCarTotal = wss != null && wss.size() > 0 ? (wss.get(0).getHjhCarNum() == null ? 0 : wss.get(0).getHjhCarNum()) : 0;
 
         StudentOverviewVo vo = new StudentOverviewVo();
@@ -1696,11 +1753,28 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
 
     @Override
-    public CommonResult studentRegister(Integer collegeId) {
+    public CommonResult studentRegister(Integer collegeId, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
 //        学生总数
-        int enrollmentTotal = welcomeStudentService.studentTotalCount(collegeId);
+        int enrollmentTotal = welcomeStudentService.studentTotalCount(collegeId, nstartTime, nendTime);
         //        获取总数
-        Integer count = welcomeStudentService.totalCount(collegeId);
+        Integer count = welcomeStudentService.totalCount(collegeId, nstartTime, nendTime);
 //        获取比例
         Double result = ((double) count / enrollmentTotal) * 100;
         String rate = String.format("%.2f", result);
@@ -1709,11 +1783,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         vo.setCount(count);
         vo.setRate(rate);
         if (ObjectUtils.isNotEmpty(collegeId)) {
-            List<StudentRegisterVo> vos = welcomeStudentService.studentMajorRegister(collegeId);
+            List<StudentRegisterVo> vos = welcomeStudentService.studentMajorRegister(collegeId, nstartTime, nendTime);
             vos.add(vo);
             return CommonResult.ok(vos);
         } else {
-            List<StudentRegisterVo> vos = welcomeStudentService.studentRegister();
+            List<StudentRegisterVo> vos = welcomeStudentService.studentRegister(nstartTime, nendTime);
             vos.add(vo);
             return CommonResult.ok(vos);
         }
@@ -1721,14 +1795,48 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult studentTraffic(Integer collegeId) {
-        List<StudentTrafficVo> vos = welcomeStudentService.studentTraffic(collegeId);
+    public CommonResult studentTraffic(Integer collegeId, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
+        List<StudentTrafficVo> vos = welcomeStudentService.studentTraffic(collegeId, nstartTime, nendTime);
         return CommonResult.ok(vos);
     }
 
     @Override
-    public CommonResult studentSexRatio() {
-
+    public CommonResult studentSexRatio(Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
         Integer manCount = welcomeStudentService.genderCount("男");
         Integer girlCount = welcomeStudentService.genderCount("女");
         StudentSexRatioVo vo = new StudentSexRatioVo();
@@ -1736,14 +1844,32 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         vo.setManCount(manCount);
         vo.setGirlCount(girlCount);
 
-        List<StudentSexRatioVo> vos = welcomeStudentService.studentSexRatio();
+        List<StudentSexRatioVo> vos = welcomeStudentService.studentSexRatio(nstartTime, nendTime);
         vos.add(vo);
 
         return CommonResult.ok(vos);
     }
 
     @Override
-    public CommonResult studentStay() {
+    public CommonResult studentStay(Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
         ArrayList<StudentStayVo> vos = new ArrayList<>();
         List<WelcomeSchool> list = welcomeSchoolService.list(new QueryWrapper<>());
         for (WelcomeSchool welcomeSchool : list) {
@@ -1989,12 +2115,30 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult levelRegister(Integer collegeId) {
+    public CommonResult levelRegister(Integer collegeId, Integer yearId) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (yearId == null) {
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            if (lastYear) {
+                nstartTime = (yearInt - 1) + "-06-01";
+                nendTime = yearInt + "-06-01";
+            } else {
+                nstartTime = yearInt + "-06-01";
+                nendTime = (yearInt + 1) + "-06-01";
+            }
+        } else {
+            nstartTime = yearId + "-06-01";
+            nendTime = (yearId + 1) + "-06-01";
+        }
+
 //        获取学生总数
-        int enrollmentTotal = welcomeStudentService.studentTotalCount(collegeId);
+        int enrollmentTotal = welcomeStudentService.studentTotalCount(collegeId, nstartTime, nendTime);
 
         //        获取报到总数
-        Integer count = welcomeStudentService.totalCount(collegeId);
+        Integer count = welcomeStudentService.totalCount(collegeId, nstartTime, nendTime);
 //        获取比例
         Double result = ((double) count / enrollmentTotal) * 100;
         String rate = String.format("%.2f", result);
@@ -2009,13 +2153,13 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         String zk = "专科";
 
 //        获取总本科人数
-        Integer bkCount = welcomeStudentService.getLevelTotalCount(bk, collegeId);
+        Integer bkCount = welcomeStudentService.getLevelTotalCount(bk, collegeId, nstartTime, nendTime);
 //        获取总专升本人数
-        Integer zsbCount = welcomeStudentService.getLevelTotalCount(zsb, collegeId);
+        Integer zsbCount = welcomeStudentService.getLevelTotalCount(zsb, collegeId, nstartTime, nendTime);
 //        获取总专科人数
-        Integer zkCount = welcomeStudentService.getLevelTotalCount(zk, collegeId);
+        Integer zkCount = welcomeStudentService.getLevelTotalCount(zk, collegeId, nstartTime, nendTime);
 
-        List<StudentRegisterVo> vos = welcomeStudentService.levelRegister(collegeId);
+        List<StudentRegisterVo> vos = welcomeStudentService.levelRegister(collegeId, nstartTime, nendTime);
         HashMap<String, StudentRegisterVo> map = new HashMap<>();
         for (StudentRegisterVo studentRegisterVo : vos) {
             Integer count1 = studentRegisterVo.getCount();

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ceshi
@@ -27,18 +27,18 @@ public interface WelcomeBedMapper extends BaseMapper<WelcomeBed> {
 
     WelcomeBedCheckVo isCheck(@Param("studentCard") String studentCard);
 
-    List<BedSqlTotalVo> queryBedSqlList(@Param("collegeId") Integer collegeId,@Param("sex") String sex);
+    List<BedSqlTotalVo> queryBedSqlList(@Param("collegeId") Integer collegeId, @Param("sex") String sex, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<SleepSqlTotalVo> queryTotalSqlList(@Param("collegeId") Integer collegeId,@Param("sex") String sex);
+    List<SleepSqlTotalVo> queryTotalSqlList(@Param("collegeId") Integer collegeId, @Param("sex") String sex, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     void updateData(@Param("bedId") Integer bedId);
 
     List<BedInfosVo> queryBedList(@Param("studentCard") String studentCard);
 
-    void updateBuild(@Param("schoolId") String schoolId,@Param("buildId") Integer buildId, @Param("build") String build,@Param("school") String school);
+    void updateBuild(@Param("schoolId") String schoolId, @Param("buildId") Integer buildId, @Param("build") String build, @Param("school") String school);
 
-    IPage<WelcomeBed> queryPageWelcomeBedsC(Page<WelcomeBed> page,@Param("schoolId") Integer schoolId,@Param("buildId") Integer buildId,@Param("dormitoryId") Integer dormitoryId,@Param("sex") String sex,@Param("isCheck") Integer isCheck,@Param("collegeIds") String collegeIds,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("retentionState") Integer retentionState);
+    IPage<WelcomeBed> queryPageWelcomeBedsC(Page<WelcomeBed> page, @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId, @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("isCheck") Integer isCheck, @Param("collegeIds") String collegeIds, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("retentionState") Integer retentionState);
 
-    IPage<WelcomeBed> queryPageWelcomeBeds(Page<WelcomeBed> page, @Param("schoolId") Integer schoolId,@Param("buildId") Integer buildId,@Param("dormitoryId") Integer dormitoryId,@Param("sex") String sex,@Param("isCheck") Integer isCheck,@Param("collegeId") Integer collegeId,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("retentionState") Integer retentionState);
+    IPage<WelcomeBed> queryPageWelcomeBeds(Page<WelcomeBed> page, @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId, @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("isCheck") Integer isCheck, @Param("collegeId") Integer collegeId, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("retentionState") Integer retentionState);
 
 }

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

@@ -18,5 +18,5 @@ import java.time.LocalDateTime;
 @Repository
 public interface WelcomeVisitorMapper extends BaseMapper<WelcomeVisitor> {
 
-    Integer countTotal(@Param("start") String start,@Param("end") String end,@Param("schoolId") Integer schoolId);
+    Integer countTotal(@Param("start") String start,@Param("end") String end,@Param("schoolId") Integer schoolId,@Param("nstartTime") String nstartTime,@Param("nendTime") String nendTime);
 }

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

@@ -29,7 +29,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     WelcomeBed queryBedData(String school, Integer buildId, Integer dormitoryId, Integer number);
 
-    List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
+    List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState);
 
     WelcomeBed getBedByCardId(String studentCard);
 
@@ -45,15 +45,15 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     WelcomeBedCheckVo isCheck(String studentCard);
 
-    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId,Integer collegeId);
+    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer bedId, Integer collegeId);
 
-    PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
+    PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, String startTime, String endTime);
 
-    List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
+    List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, String startTime, String endTime);
 
-    List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex);
+    List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex,String startTime,String endTime);
 
-    List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex);
+    List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex,String startTime,String endTime);
 
     void updateData(Integer bedId);
 
@@ -63,7 +63,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> changeDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex);
 
-    List<WelcomeBed> changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId,String sex);
+    List<WelcomeBed> changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex);
 
     List<WelcomeBed> replaceBuildGroup(Integer schoolId, Integer collegeId, String sex);
 
@@ -82,13 +82,13 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
 
-    PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds , Integer majorId, Integer classstrId, String name);
+    PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name, String startTime, String endTime);
 
-    List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name);
+    List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name, String startTime, String endTime);
 
     List<BedInfosVo> queryBedList(String studentCard);
 
-    void updateBuild(String schoolId, Integer buildId, String build,String school);
+    void updateBuild(String schoolId, Integer buildId, String build, String school);
 
     WelcomeBed getBedByAdmissNum(String admissNum);
 }

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

@@ -31,55 +31,57 @@ 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,Integer isCheck,String school,String batchValue,Integer carNumber);
+    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,String startTime,String endTime);
 
     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,Integer isCheck,String school,String batchValue,Integer carNumber);
+    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,String startTime,String endTime);
 
-    WelcomeStudent queryStudentInfo(Integer collegeId, Integer majorId, Integer classstrId,String admissNum);
+    WelcomeStudent queryStudentInfo(Integer collegeId, Integer majorId, Integer classstrId, String admissNum);
 
     List<WelcomeStudent> getDataByAdmissNum(List<String> admissNum);
 
-    List<StudentRegisterVo> studentRegister();
+    List<StudentRegisterVo> studentRegister(String startTime, String endTime);
 
-    List<StudentTrafficVo> studentTraffic(Integer collegeId);
+    List<StudentTrafficVo> studentTraffic(Integer collegeId, String startTime, String endTime);
 
     Integer genderCount(String gender);
 
-    List<StudentSexRatioVo> studentSexRatio();
+    List<StudentSexRatioVo> studentSexRatio(String startTime, String endTime);
 
-    Integer totalCount(Integer collegeId);
+    Integer totalCount(Integer collegeId, String startTime, String endTime);
 
-    int payCount(Integer collegeId);
+    int payCount(Integer collegeId, String startTime, String endTime);
 
     List<WelcomeStudent> getStudent(CheckInVo checkInVo);
 
     WelcomeStudent getDataByNum(String admissNum);
 
-    List<StudentTotalVo> queryStudentTotal();
+    List<StudentTotalVo> queryStudentTotal(String startTime, String endTime);
 
     /**
      * 更新学生信息中的车牌信息
+     *
      * @param studentCard 学号/录取号
-     * @param carNumber 车牌号
+     * @param carNumber   车牌号
      */
     void updateCarNumber(String studentCard, String carNumber);
 
     /**
      * 根据身份证号获取学生信息
+     *
      * @param studentCard 身份证号
      * @return 学生信息
      */
     WelcomeStudent getByStudentCard(String studentCard);
 
-    List<StudentRegisterVo> studentMajorRegister(Integer collegeId);
+    List<StudentRegisterVo> studentMajorRegister(Integer collegeId, String startTime, String endTime);
 
-    List<StudentRegisterVo> levelRegister(Integer collegeId);
+    List<StudentRegisterVo> levelRegister(Integer collegeId, String startTime, String endTime);
 
-    Integer getLevelTotalCount(String batchValue,Integer collegeId);
+    Integer getLevelTotalCount(String batchValue, Integer collegeId, String startTime, String endTime);
 
-    int studentTotalCount(Integer collegeId);
+    int studentTotalCount(Integer collegeId, String startTime, String endTime);
 }

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

@@ -18,13 +18,15 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
 
     /**
      * 新增访客记录
-     * @param studentCard 学生身份证号
+     *
+     * @param studentCard    学生身份证号
      * @param visitorRequest 访客信息
      */
     void addVisitor(String studentCard, WelcomeVisitorRequest visitorRequest);
 
     /**
      * 获取当前用户访客记录
+     *
      * @param studentCard 学生身份证号
      * @return 访客信息
      */
@@ -32,6 +34,7 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
 
     /**
      * 根据记录id获取访客记录
+     *
      * @param id 记录id
      * @return 访客信息
      */
@@ -39,24 +42,28 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
 
     /**
      * 删除当前用户的访客记录
+     *
      * @param studentCard 学生身份证号
      */
     boolean deleteByCurUser(String studentCard);
 
     /**
      * 管理员新增访客记录
+     *
      * @param visitorRequest 访客信息
      */
     void addVisitorByAdmin(WelcomeVisitorRequest visitorRequest);
 
     /**
      * 管理员更新访客记录
+     *
      * @param visitorRequest 访客信息
      */
     void updateVisitorByAdmin(WelcomeVisitorRequest visitorRequest);
 
     /**
      * 访客记录分页
+     *
      * @param visitorQuery 分页条件
      * @return 分页结果
      */
@@ -67,7 +74,7 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
      */
     void export(WelcomeVisitorQuery visitorQuery);
 
-    Integer countTotal(String start, String end,Integer schoolId);
+    Integer countTotal(String start, String end, Integer schoolId, String nstartTime, String nendTime);
 
     Integer carTotal();
 

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

@@ -45,7 +45,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
+    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState) {
 //        Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
 //        QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -61,7 +61,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
 //        IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
 //        return new PageUtils<>(result);
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeBed> result = welcomeBedMapper.queryPageWelcomeBeds(page,schoolId,buildId,dormitoryId,sex,isCheck,collegeId,majorId,classstrId,retentionState);
+        IPage<WelcomeBed> result = welcomeBedMapper.queryPageWelcomeBeds(page, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId, retentionState);
         return new PageUtils<>(result);
     }
 
@@ -89,7 +89,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
+    public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -100,7 +100,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.eq(retentionState != null, "retention_state", retentionState);
-        queryWrapper.orderByAsc("build","dormitory","number");
+        queryWrapper.orderByAsc("build", "dormitory", "number");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -128,7 +128,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1);
+                .eq(WelcomeBed::getRetentionState, 1);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
 
@@ -136,9 +136,9 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
 
     @Override
     public List<BedDetailsVo> getBedList(Integer schoolId, Integer buildId, Integer dormitoryId, String studentCard) {
-        List<BedDetailsVo> result = welcomeBedMapper.getBedList(schoolId,buildId,dormitoryId,studentCard);
+        List<BedDetailsVo> result = welcomeBedMapper.getBedList(schoolId, buildId, dormitoryId, studentCard);
 
-        BedDetailsVo vo = welcomeBedMapper.getBedDetailsVo(schoolId,buildId,dormitoryId,studentCard);
+        BedDetailsVo vo = welcomeBedMapper.getBedDetailsVo(schoolId, buildId, dormitoryId, studentCard);
 
         result.add(vo);
         return result;
@@ -148,7 +148,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     public List<WelcomeBed> queryDormitorys(Integer dormitory) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dormitory_id", dormitory)
-                .eq("retention_state",1);
+                .eq("retention_state", 1);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -168,21 +168,21 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId,Integer collegeId) {
+    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer bedId, Integer collegeId) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
                 .eq(WelcomeBed::getIsCheck, 1)
-                .eq(WelcomeBed::getRetentionState,1)
-                .ne(WelcomeBed::getId,bedId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .ne(WelcomeBed::getId, bedId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
-    public PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
+    public PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, String startTime, String endTime) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -192,14 +192,15 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.like(name != null, "name", name);
-        queryWrapper.eq( "is_check", 1);
+        queryWrapper.eq("is_check", 1);
+        queryWrapper.between("create_time", startTime, endTime);
         queryWrapper.orderByDesc("create_time");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
     @Override
-    public List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
+    public List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, String startTime, String endTime) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -208,21 +209,22 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.like(name != null, "name", name);
-        queryWrapper.eq( "is_check", 1);
+        queryWrapper.eq("is_check", 1);
+        queryWrapper.between("create_time", startTime, endTime);
         queryWrapper.orderByDesc("create_time");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
-    public List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex) {
-        List<BedSqlTotalVo> result = welcomeBedMapper.queryBedSqlList(collegeId, sex);
+    public List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex,String startTime,String endTime) {
+        List<BedSqlTotalVo> result = welcomeBedMapper.queryBedSqlList(collegeId, sex,startTime,endTime);
         return result;
     }
 
     @Override
-    public List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex) {
-        List<SleepSqlTotalVo> result = welcomeBedMapper.queryTotalSqlList(collegeId, sex);
+    public List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex, String startTime, String endTime) {
+        List<SleepSqlTotalVo> result = welcomeBedMapper.queryTotalSqlList(collegeId, sex, startTime, endTime);
         return result;
     }
 
@@ -232,16 +234,15 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
 
-
     @Override
     public List<WelcomeBed> changeBuildGroup(Integer schoolId, Integer collegeId, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -249,28 +250,28 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> changeDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getBuildId,buildId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId, WelcomeBed::getDormitoryId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
-    public List<WelcomeBed> changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId,String sex) {
+    public List<WelcomeBed> changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getBuildId,buildId)
-                .eq(WelcomeBed::getDormitoryId,dormitoryId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId,WelcomeBed::getId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId, WelcomeBed::getDormitoryId, WelcomeBed::getId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -278,12 +279,12 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> replaceBuildGroup(Integer schoolId, Integer collegeId, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 1)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -291,13 +292,13 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> replaceDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getBuildId,buildId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 1)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId, WelcomeBed::getDormitoryId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -305,14 +306,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> replaceBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getBuildId,buildId)
-                .eq(WelcomeBed::getDormitoryId,dormitoryId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 1)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId,WelcomeBed::getId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId, WelcomeBed::getDormitoryId, WelcomeBed::getId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -320,14 +321,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> hBuildGroup(Integer schoolId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getMajorId,majorId)
-                .eq(WelcomeBed::getClassstrId,classstrid)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getMajorId, majorId)
+                .eq(WelcomeBed::getClassstrId, classstrid)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -335,15 +336,15 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> hDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getBuildId,buildId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getMajorId,majorId)
-                .eq(WelcomeBed::getClassstrId,classstrid)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getMajorId, majorId)
+                .eq(WelcomeBed::getClassstrId, classstrid)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId, WelcomeBed::getDormitoryId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -351,16 +352,16 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
-                .eq(WelcomeBed::getBuildId,buildId)
-                .eq(WelcomeBed::getDormitoryId,dormitoryId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
-                .eq(WelcomeBed::getMajorId,majorId)
-                .eq(WelcomeBed::getClassstrId,classstrid)
-                .eq(WelcomeBed::getSex,sex)
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
+                .eq(WelcomeBed::getMajorId, majorId)
+                .eq(WelcomeBed::getClassstrId, classstrid)
+                .eq(WelcomeBed::getSex, sex)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1)
-                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId,WelcomeBed::getId);
+                .eq(WelcomeBed::getRetentionState, 1)
+                .groupBy(WelcomeBed::getSchoolId, WelcomeBed::getBuildId, WelcomeBed::getDormitoryId, WelcomeBed::getId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -383,7 +384,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
 //        return new PageUtils<>(result);
 
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeBed> result = welcomeBedMapper.queryPageWelcomeBedsC(page,schoolId,buildId,dormitoryId,sex,isCheck,collegeIds,majorId,classstrId,retentionState);
+        IPage<WelcomeBed> result = welcomeBedMapper.queryPageWelcomeBedsC(page, schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId, retentionState);
         return new PageUtils<>(result);
     }
 
@@ -395,17 +396,17 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
         queryWrapper.eq(StringUtils.hasText(sex), "sex", sex);
         queryWrapper.eq(isCheck != null, "is_check", isCheck);
-        queryWrapper.in( "college_id", collegeIds);
+        queryWrapper.in("college_id", collegeIds);
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.eq(retentionState != null, "retention_state", retentionState);
-        queryWrapper.orderByAsc("build","dormitory","number");
+        queryWrapper.orderByAsc("build", "dormitory", "number");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
-    public PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name) {
+    public PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name, String startTime, String endTime) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -415,23 +416,25 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.like(name != null, "name", name);
-        queryWrapper.eq( "is_check", 1);
+        queryWrapper.eq("is_check", 1);
+        queryWrapper.between("create_time", startTime, endTime);
         queryWrapper.orderByDesc("create_time");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
     @Override
-    public List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name) {
+    public List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name, String startTime, String endTime) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
         queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
-        queryWrapper.in( "college_id", collegeIds);
+        queryWrapper.in("college_id", collegeIds);
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.like(name != null, "name", name);
-        queryWrapper.eq( "is_check", 1);
+        queryWrapper.eq("is_check", 1);
+        queryWrapper.between("create_time", startTime, endTime);
         queryWrapper.orderByDesc("create_time");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
@@ -444,22 +447,22 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
-                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getCollegeId, collegeId)
                 .eq(WelcomeBed::getIsCheck, 0)
-                .eq(WelcomeBed::getRetentionState,1);
+                .eq(WelcomeBed::getRetentionState, 1);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
-    public List<BedInfosVo> queryBedList(String studentCard){
+    public List<BedInfosVo> queryBedList(String studentCard) {
         List<BedInfosVo> result = welcomeBedMapper.queryBedList(studentCard);
         return result;
     }
 
     @Override
-    public void updateBuild(String schoolId, Integer buildId, String build,String school) {
-        welcomeBedMapper.updateBuild(schoolId,buildId,build,school);
+    public void updateBuild(String schoolId, Integer buildId, String build, String school) {
+        welcomeBedMapper.updateBuild(schoolId, buildId, build, school);
     }
 
     @Override

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

@@ -25,7 +25,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -74,24 +74,24 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     @Override
     public WelcomeStudent getDataByIdcard(String cardId) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("card_id",cardId);
+        queryWrapper.eq("card_id", cardId);
         WelcomeStudent wa = welcomeStudentMapper.selectOne(queryWrapper);
         return wa;
     }
 
     @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,Integer isCheck,String school,String batchValue,Integer carNumber) {
+    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, String startTime, String endTime) {
         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,isCheck,school,batchValue,carNumber);
+        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber, startTime, endTime);
         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,Integer isCheck,String school,String batchValue,Integer carNumber) {
+    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, String startTime, String endTime) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay,isCheck,school,batchValue,carNumber);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber, startTime, endTime);
         return result;
     }
 
@@ -115,56 +115,58 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public List<StudentRegisterVo> studentRegister() {
-        return welcomeStudentMapper.studentRegister();
+    public List<StudentRegisterVo> studentRegister(String startTime, String endTime) {
+        return welcomeStudentMapper.studentRegister(startTime, endTime);
     }
 
     @Override
-    public List<StudentTrafficVo> studentTraffic(Integer collegeId) {
-        return welcomeStudentMapper.studentTraffic(collegeId);
+    public List<StudentTrafficVo> studentTraffic(Integer collegeId, String startTime, String endTime) {
+        return welcomeStudentMapper.studentTraffic(collegeId, startTime, endTime);
     }
 
     @Override
     public Integer genderCount(String gender) {
-        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getSex,gender)
-                .eq(WelcomeStudent::getIdenType,1)
-                .eq(WelcomeStudent::getFillStatus,"已填报");
+        LambdaQueryWrapper<WelcomeStudent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getSex, gender)
+                .eq(WelcomeStudent::getIdenType, 1)
+                .eq(WelcomeStudent::getFillStatus, "已填报");
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }
 
     @Override
-    public List<StudentSexRatioVo> studentSexRatio() {
-        return welcomeStudentMapper.studentSexRatio();
+    public List<StudentSexRatioVo> studentSexRatio(String startTime, String endTime) {
+        return welcomeStudentMapper.studentSexRatio(startTime, endTime);
     }
 
     @Override
-    public Integer totalCount(Integer collegeId) {
-        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getIdenType,1)
-                .eq(WelcomeStudent::getIsRegistered,1)
-                .eq(ObjectUtils.isNotEmpty(collegeId),WelcomeStudent::getCollegeId,collegeId);
+    public Integer totalCount(Integer collegeId, String startTime, String endTime) {
+        LambdaQueryWrapper<WelcomeStudent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getIdenType, 1)
+                .eq(WelcomeStudent::getIsRegistered, 1)
+                .eq(ObjectUtils.isNotEmpty(collegeId), WelcomeStudent::getCollegeId, collegeId);
+        wrapper.between(WelcomeStudent::getCreateTime, startTime, endTime);
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }
 
     @Override
-    public int payCount(Integer collegeId) {
+    public int payCount(Integer collegeId, String startTime, String endTime) {
         QueryWrapper<WelcomeStudent> wss = new QueryWrapper<>();
 //        wss.gt("pay_amount",0);//交了钱就算已交付
-        wss.eq("is_pay",1)
-                .eq(ObjectUtils.isNotEmpty(collegeId),"college_id",collegeId);//
+        wss.eq("is_pay", 1)
+                .eq(ObjectUtils.isNotEmpty(collegeId), "college_id", collegeId);//
+        wss.between("create_time", startTime, endTime);
         Integer count = welcomeStudentMapper.selectCount(wss);
         return count;
     }
 
     @Override
     public List<WelcomeStudent> getStudent(CheckInVo checkInVo) {
-        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getName,checkInVo.getName())
-                        .eq(WelcomeStudent::getAdmissNum,checkInVo.getAdmissNum())
-                .eq(WelcomeStudent::getIdenType,1);
+        LambdaQueryWrapper<WelcomeStudent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getName, checkInVo.getName())
+                .eq(WelcomeStudent::getAdmissNum, checkInVo.getAdmissNum())
+                .eq(WelcomeStudent::getIdenType, 1);
         List<WelcomeStudent> list = welcomeStudentMapper.selectList(wrapper);
         return list;
     }
@@ -174,7 +176,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum);
         queryWrapper.eq(StringUtils.hasText(cardId), "card_id", cardId);
-        queryWrapper.eq("iden_type",1);
+        queryWrapper.eq("iden_type", 1);
         List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
         return (result != null && result.size() > 0) ? result.get(0) : null;
     }
@@ -183,7 +185,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     public WelcomeStudent getDataByNum(String admissNum) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum);
-        queryWrapper.eq("iden_type",1);
+        queryWrapper.eq("iden_type", 1);
         List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
         return (result != null && result.size() > 0) ? result.get(0) : null;
     }
@@ -193,14 +195,14 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     public List<WelcomeStudent> queryStudentByCardId(List<String> cardIds) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.in(cardIds != null && cardIds.size() > 0, "card_id", cardIds);//身份证号
-        queryWrapper.eq("iden_type",1);
+        queryWrapper.eq("iden_type", 1);
         List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
         return (cardIds != null && cardIds.size() > 0) ? result : null;
     }
 
     @Override
-    public List<StudentTotalVo> queryStudentTotal() {
-        List<StudentTotalVo> result = welcomeStudentMapper.queryStudentTotal();
+    public List<StudentTotalVo> queryStudentTotal(String startTime,String endTime) {
+        List<StudentTotalVo> result = welcomeStudentMapper.queryStudentTotal(startTime,endTime);
         return result;
     }
 
@@ -227,30 +229,32 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public List<StudentRegisterVo> studentMajorRegister(Integer collegeId) {
-        return welcomeStudentMapper.studentMajorRegister(collegeId);
+    public List<StudentRegisterVo> studentMajorRegister(Integer collegeId, String startTime, String endTime) {
+        return welcomeStudentMapper.studentMajorRegister(collegeId, startTime, endTime);
     }
 
     @Override
-    public List<StudentRegisterVo> levelRegister(Integer collegeId) {
-        return welcomeStudentMapper.levelRegister(collegeId);
+    public List<StudentRegisterVo> levelRegister(Integer collegeId, String startTime, String endTime) {
+        return welcomeStudentMapper.levelRegister(collegeId, startTime, endTime);
     }
 
     @Override
-    public Integer getLevelTotalCount(String batchValue,Integer collegeId) {
-        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getIdenType,1)
-                .eq(WelcomeStudent::getBatchValue,batchValue)
-                .eq(ObjectUtils.isNotEmpty(collegeId),WelcomeStudent::getCollegeId,collegeId);
+    public Integer getLevelTotalCount(String batchValue, Integer collegeId, String startTime, String endTime) {
+        LambdaQueryWrapper<WelcomeStudent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getIdenType, 1)
+                .eq(WelcomeStudent::getBatchValue, batchValue)
+                .eq(ObjectUtils.isNotEmpty(collegeId), WelcomeStudent::getCollegeId, collegeId);
+        wrapper.between(WelcomeStudent::getCreateTime, startTime, endTime);
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }
 
     @Override
-    public int studentTotalCount(Integer collegeId) {
-        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeStudent::getIdenType,1)
-                .eq(ObjectUtils.isNotEmpty(collegeId),WelcomeStudent::getCollegeId,collegeId);
+    public int studentTotalCount(Integer collegeId, String startTime, String endTime) {
+        LambdaQueryWrapper<WelcomeStudent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getIdenType, 1)
+                .eq(ObjectUtils.isNotEmpty(collegeId), WelcomeStudent::getCollegeId, collegeId);
+        wrapper.between(WelcomeStudent::getCreateTime, startTime, endTime);
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count;
     }

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

@@ -170,9 +170,9 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         // 校验车牌数量  4 固定写法
         WelcomeSetting setting = settingService.getManageById("4");
         int carNum;
-        if(visitorRequest.getSchool().equals("墨轩湖校区")){
+        if (visitorRequest.getSchool().equals("墨轩湖校区")) {
             carNum = setting.getMxhCarNum();
-        }else{
+        } else {
             carNum = setting.getHjhCarNum();
         }
 
@@ -193,7 +193,8 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
 
     /**
      * 校验当天的车辆数量
-     * @param id 访问预约id，新增时为null
+     *
+     * @param id     访问预约id，新增时为null
      * @param curDay 当前日期
      * @param carNum 车辆最大可预约数量
      */
@@ -248,7 +249,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         wrapper.like(StrUtil.isNotBlank(visitorQuery.getCarNumber()), WelcomeVisitor::getCarNumber, visitorQuery.getCarNumber());
         wrapper.like(StrUtil.isNotBlank(visitorQuery.getName()), WelcomeVisitor::getName, visitorQuery.getName());
         wrapper.eq(StrUtil.isNotBlank(visitorQuery.getSchool()), WelcomeVisitor::getSchool, visitorQuery.getSchool());
-        wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime())&&StrUtil.isNotBlank(visitorQuery.getEndTime()),WelcomeVisitor::getStartTime,visitorQuery.getStartTime(),visitorQuery.getEndTime());
+        wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime()) && StrUtil.isNotBlank(visitorQuery.getEndTime()), WelcomeVisitor::getStartTime, visitorQuery.getStartTime(), visitorQuery.getEndTime());
 
         IPage<WelcomeVisitor> page = baseMapper.selectPage(new IPageUtil<WelcomeVisitor>().getPage(visitorQuery), wrapper);
 
@@ -261,7 +262,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         LambdaQueryWrapper<WelcomeVisitor> wrapper = new LambdaQueryWrapper<>();
         wrapper.orderByDesc(WelcomeVisitor::getId);
         wrapper.eq(StrUtil.isNotBlank(visitorQuery.getSchool()), WelcomeVisitor::getSchool, visitorQuery.getSchool());
-        wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime())&&StrUtil.isNotBlank(visitorQuery.getEndTime()),WelcomeVisitor::getStartTime,visitorQuery.getStartTime(),visitorQuery.getEndTime());
+        wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime()) && StrUtil.isNotBlank(visitorQuery.getEndTime()), WelcomeVisitor::getStartTime, visitorQuery.getStartTime(), visitorQuery.getEndTime());
         List<WelcomeVisitor> welcomeVisitors = list(wrapper);
 
         List<WelcomeVisitorVO> welcomeVisitorVOS = BeanUtil.copyListProperties(welcomeVisitors, WelcomeVisitorVO::new);
@@ -291,9 +292,9 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     }
 
     @Override
-    public Integer countTotal(String start, String end,Integer schoolId) {
+    public Integer countTotal(String start, String end, Integer schoolId, String nstartTime, String nendTime) {
 
-        Integer count=welcomeVisitorMapper.countTotal(start,end,schoolId);
+        Integer count = welcomeVisitorMapper.countTotal(start, end, schoolId, nstartTime, nendTime);
         return count;
     }
 
@@ -311,7 +312,8 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
 
     /**
      * 新增车辆信息
-     * @param visitor  访客信息
+     *
+     * @param visitor 访客信息
      */
     private void addVisitorCar(WelcomeVisitor visitor) {
         // 新增车辆信息

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

@@ -127,6 +127,7 @@
         <if test="sex != null and sex != ''">
             and wb.sex = #{sex}
         </if>
+        and wb.create_time between #{startTime} and #{endTime}
         group by wb.college,wb.sex,wb.build,wb.dormitory
     </select>
 
@@ -151,6 +152,7 @@
         <if test="sex != null and sex != ''">
             and wb.sex = #{sex}
         </if>
+        and wb.create_time between #{startTime} and #{endTime}
         group by wb.college,wb.sex
     </select>
 

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

@@ -92,6 +92,7 @@
             </if>
         </if>
         and ws.iden_type != 2
+        AND ws.create_time between #{startTime} and #{endTime}
         order by ws.update_time desc
     </select>
 
@@ -109,6 +110,7 @@
             ws.deleted = 0
           AND ws.iden_type=1
           AND ws.is_registered = 1
+          AND ws.create_time between #{startTime} and #{endTime}
         GROUP BY
             college_id
     </select>
@@ -145,6 +147,7 @@
                   AND ws.sex = '男'
                   AND ws.iden_type = 1
                   AND ws.fill_status = "已填报"
+                  AND ws.create_time between #{startTime} and #{endTime}
                 GROUP BY
                     college_id
             ) new ON w.college_id = new.collegeId
@@ -159,6 +162,7 @@
                   AND ws.sex = '女'
                   AND ws.iden_type = 1
                   AND ws.fill_status = "已填报"
+                  AND ws.create_time between #{startTime} and #{endTime}
                 GROUP BY
                     college_id
             ) new2 ON w.college_id = new2.collegeId
@@ -182,6 +186,7 @@
     <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
+        AND create_time between #{startTime} and #{endTime}
         group by college,sex
     </select>
     <select id="studentMajorRegister" resultType="com.template.model.vo.StudentRegisterVo">
@@ -196,6 +201,7 @@
           AND ws.iden_type=1
           AND ws.is_registered = 1
           AND ws.college_id= #{collegeId}
+          AND ws.create_time between #{startTime} and #{endTime}
         GROUP BY
             ws.major_id
     </select>
@@ -213,6 +219,7 @@
          <if test="collegeId != null">
             and ws.college_id = #{collegeId}
          </if>
+        AND ws.create_time between #{startTime} and #{endTime}
         GROUP BY
             ws.batch_value
     </select>

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

@@ -12,5 +12,6 @@
         AND start_time >= #{start}
         AND #{end} >= end_time
         AND school_id = #{schoolId}
+        AND create_time between #{nstartTime} and #{nendTime}
     </select>
 </mapper>