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

@@ -10,12 +10,17 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.ParseException;
 
 
 @RequestMapping("/api/home")
 @Api(tags = {"LoginController"}, value = "登录")
 public interface LoginControllerAPI {
 
+    @GetMapping(value = "/testUpdate")
+    @ApiOperation(value = "测试更新", notes = "测试更新", httpMethod = "GET")
+    CommonResult testUpdate();
+
     @GetMapping(value = "/queryReduce")
     @ApiOperation(value = "查看系统版本", notes = "查看系统版本", httpMethod = "GET")
     CommonResult queryReduce();
@@ -34,7 +39,7 @@ public interface LoginControllerAPI {
 
     @PostMapping(value = "/mobileLogin")
     @ApiOperation(value = "移动端登录", notes = "移动端登录", httpMethod = "POST")
-    CommonResult mobileLogin(@Validated @RequestBody mobileLoginRequest mlr, BindingResult bindingResult);
+    CommonResult mobileLogin(@Validated @RequestBody mobileLoginRequest mlr, BindingResult bindingResult) throws ParseException;
 
     @GetMapping(value = "/writeCarInfo")
     @ApiOperation(value = "写入车闸", notes = "写入车闸", httpMethod = "GET")

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, Integer yearId) throws ParseException;
 
     @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, Integer yearId) throws ParseException;
 
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
@@ -96,11 +96,11 @@ 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, Integer yearId) throws ParseException;
+    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, String batchValue) 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, Integer yearId) throws ParseException;
+    void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId, Integer yearId, String batchValue) throws ParseException;
 
     @GetMapping(value = "/changeBuildGroup")
     @ApiOperation(value = "换床楼栋分组", notes = "学院寝室分组", httpMethod = "GET")

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

@@ -30,7 +30,7 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "/listDormitory")
     @ApiOperation(value = "查询寝室", notes = "查询寝室", httpMethod = "GET")
-    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState,Integer accountId);
+    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState,Integer accountId,Integer yearId) throws ParseException;
 
 
     @GetMapping(value = "/dormitoryGroup")
@@ -54,7 +54,7 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "welcomeDormitoryExport")
     @ApiOperation(value = "导出寝室信息数据", notes = "导出寝室信息数据", httpMethod = "GET")
-    void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState,Integer accountId);
+    void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState,Integer accountId,Integer yearId) throws ParseException;
 
     @PostMapping(value = "/batchOperation")
     @ApiOperation(value = "批量操作", notes = "批量操作", httpMethod = "POST")

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

@@ -17,7 +17,7 @@ public interface WelcomeLogControllerAPI {
 
     @GetMapping("/queryLogPages")
     @ApiOperation(value = "日志分页数据", httpMethod = "GET")
-    CommonResult queryLogPages(@RequestAttribute Integer userId, @RequestParam int currentPage, @RequestParam int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime) throws ParseException;
+    CommonResult queryLogPages(@RequestParam int currentPage, @RequestParam int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime,String content) throws ParseException;
 
     @GetMapping(value = "/queryLogLevel")
     @ApiOperation(value = "获取日志级别下拉列表数据", notes = "获取日志级别下拉列表数据", httpMethod = "GET")

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

@@ -26,7 +26,7 @@ public interface WelcomePaySettingControllerAPI {
 
     @GetMapping(value = "/getPageDatas")
     @ApiOperation(value = "获取全部设置数据")
-    CommonResult getPageDatas(@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, String eduLevel);
+    CommonResult getPageDatas(@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, String eduLevel, Integer yearId) throws ParseException;
 
     @PostMapping(value = "/insertPaySetting")
     @ApiOperation(value = "缴费设置", notes = "缴费设置", httpMethod = "POST")
@@ -51,7 +51,7 @@ public interface WelcomePaySettingControllerAPI {
 
     @GetMapping(value = "paySettingExport")
     @ApiOperation(value = "导出缴费设置数据", notes = "导出缴费设置数据", httpMethod = "GET")
-    void paySettingExport(@RequestAttribute String userId, HttpServletResponse response, Integer collegeId, Integer majorId, String eduLevel);
+    void paySettingExport(@RequestAttribute String userId, HttpServletResponse response, Integer collegeId, Integer majorId, String eduLevel,Integer yearId) throws ParseException;
 
 
 }

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

@@ -80,11 +80,11 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/queryStudentByToken")
     @ApiOperation(value = "学生住宿情况", notes = "学生住宿情况", httpMethod = "GET")
-    CommonResult queryStudentByToken(@RequestAttribute String userId);
+    CommonResult queryStudentByToken(@RequestAttribute String userId) throws ParseException;
 
     @GetMapping(value = "/queryStudentInfo")
     @ApiOperation(value = "查询学生信息", notes = "查询学生信息", httpMethod = "GET")
-    CommonResult queryStudentInfo(@RequestParam String admissNum);
+    CommonResult queryStudentInfo(@RequestParam String admissNum) throws ParseException;
 
     @PostMapping(value = "/isRegistered")
     @ApiOperation(value = "是否已报到", notes = "是否已报到", httpMethod = "POST")

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -42,7 +43,7 @@ public interface WelcomeVisitorControllerAPI {
 
     @GetMapping("admin/page")
     @ApiOperation(value = "访客记录分页")
-    CommonResult<PageUtils<WelcomeVisitorVO>> page(WelcomeVisitorQuery visitorQuery);
+    CommonResult<PageUtils<WelcomeVisitorVO>> page(WelcomeVisitorQuery visitorQuery) throws ParseException;
 
     @PostMapping("admin/add")
     @ApiOperation(value = "管理员新增访客记录")
@@ -62,6 +63,6 @@ public interface WelcomeVisitorControllerAPI {
 
     @GetMapping("admin/export")
     @ApiOperation(value = "导出访客记录")
-    void export(WelcomeVisitorQuery visitorQuery);
+    void export(WelcomeVisitorQuery visitorQuery) throws ParseException;
 
 }

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

@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URLEncoder;
+import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -61,6 +62,23 @@ public class LoginController implements LoginControllerAPI {
 
     private static Logger logger = LoggerFactory.getLogger(LoginController.class);
 
+    @Override
+    @PassToken
+    public CommonResult testUpdate() {
+        List<Integer> ids = new ArrayList<>();
+        ids.add(6454);
+        ids.add(6457);
+        ids.add(6458);
+        ids.add(6461);
+        ids.add(6469);
+        ids.add(6471);
+        ids.add(6472);
+        ids.add(6473);
+        ids.add(6474);
+        int result = welcomeStudentService.updateStudents(ids);
+        return CommonResult.ok(result);
+    }
+
     /**
      * 查看系统版本号
      *
@@ -237,8 +255,8 @@ public class LoginController implements LoginControllerAPI {
 
         System.out.println("微校授权校区：" + campus);
 
-        if(student != null){
-            idenType =student.getIdenType();
+        if (student != null) {
+            idenType = student.getIdenType();
         }
 
         Integer studentId = 0;
@@ -273,7 +291,7 @@ public class LoginController implements LoginControllerAPI {
             System.out.println("微校授权失败，学生信息新增异常：" + user_name + "" + card_number);
             response.sendRedirect(wxOpenidConfig.getIp() + "/#/pages/404/404/?message=" + URLEncoder.encode("用户在系统中不存在，请联系管理员", "UTF-8"));
             throw new Exception("微校授权失败！");
-        }else if(student != null && idenType == 1){
+        } else if (student != null && idenType == 1) {
             //更新微校获取的年纪信息
 //            student.setAdmissNum(card_number);
 //            student.setName(user_name);
@@ -303,7 +321,19 @@ public class LoginController implements LoginControllerAPI {
                 System.out.println("进支付比较1" + JSON.toJSON(payInfos));
                 if (payInfos != null && payInfos.size() > 0) {
                     System.out.println("进支付比较2");
-                    WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue());
+                    String nstartTime = null;
+                    String nendTime = null;
+                    boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+                    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";
+                    }
+                    WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue(), nstartTime, nendTime);
                     System.out.println("进支付比较3" + JSON.toJSON(paySettings));
                     if (paySettings != null) {
                         System.out.println("进支付比较4");
@@ -330,7 +360,7 @@ public class LoginController implements LoginControllerAPI {
             studentId = student.getId();
         }
 
-        if(student.getIsPay() == null){
+        if (student.getIsPay() == null) {
             student.setIsPay(0);
         }
         wxLoginVo wlv = new wxLoginVo();
@@ -449,7 +479,7 @@ public class LoginController implements LoginControllerAPI {
     @AWelcomeTypeLog("登录")
     @AWelcomeLogMode("移动端登录模块")
     @AWelcomeLevelLog("信息")
-    public CommonResult mobileLogin(mobileLoginRequest mlr, BindingResult bindingResult) {
+    public CommonResult mobileLogin(mobileLoginRequest mlr, BindingResult bindingResult) throws ParseException {
         if (mlr == null) {
             return CommonResult.fail("请传递参数");
         }
@@ -536,7 +566,19 @@ public class LoginController implements LoginControllerAPI {
             System.out.println("进支付比较1" + JSON.toJSON(payInfos));
             if (payInfos != null && payInfos.size() > 0) {
                 System.out.println("进支付比较2");
-                WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue());
+                String nstartTime = null;
+                String nendTime = null;
+                boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+                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";
+                }
+                WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue(), nstartTime, nendTime);
                 System.out.println("进支付比较3" + JSON.toJSON(paySettings));
                 if (paySettings != null) {
                     System.out.println("进支付比较4");
@@ -561,7 +603,7 @@ public class LoginController implements LoginControllerAPI {
             }
         }
 
-        if(student.getIsPay() == null){
+        if (student.getIsPay() == null) {
             student.setIsPay(0);
         }
         long expired = 1000 * 60 * 60 * 24 * 365;

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

@@ -58,7 +58,7 @@ public class SystemSettingController implements SystemSettingControllerAPI {
 
     @Override
     public CommonResult querySettings() {
-        List<WelcomePaySetting> wps = welcomePaySettingService.list(null);
+        //List<WelcomePaySetting> wps = welcomePaySettingService.list(null);
         List<WelcomeOpenSetting> wos = welcomeOpenSettingService.list(null);
         List<WelcomeArriveSetting> wass = welcomeArriveSettingService.list(null);
         List<WelcomeSetting> ws = welcomeSettingService.list(null);

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

@@ -219,7 +219,25 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState, Integer accountId) {
+    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState, 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)) {
@@ -236,9 +254,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 //                collegeIds.add(s);
 //            }
             collegeIds = account.getCollegeId();
-            result = welcomeBedService.queryPageWelcomeBedsC(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId, retentionState);
+            result = welcomeBedService.queryPageWelcomeBedsC(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId, retentionState, nstartTime, nendTime);
         } else {
-            result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId, retentionState);
+            result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId, retentionState, nstartTime, nendTime);
         }
 
         return CommonResult.ok(result);
@@ -708,7 +726,24 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState, Integer accountId) {
+    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId, Integer retentionState, 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)) {
@@ -723,9 +758,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             for (String s : split) {
                 collegeIds.add(s);
             }
-            result = welcomeBedService.queryPageWelcomeBedsS(schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId, retentionState);
+            result = welcomeBedService.queryPageWelcomeBedsS(schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId, retentionState, nstartTime, nendTime);
         } else {
-            result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId, retentionState);
+            result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId, retentionState, nstartTime, nendTime);
         }
 
 
@@ -1234,7 +1269,7 @@ 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, Integer yearId) throws ParseException {
+    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, String batchValue) throws ParseException {
         String nstartTime = null;
         String nendTime = null;
         boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
@@ -1267,15 +1302,15 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             for (String s : split) {
                 collegeIds.add(s);
             }
-            result = welcomeBedService.studentAccommodationPageS(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name, nstartTime, nendTime);
+            result = welcomeBedService.studentAccommodationPageS(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name, nstartTime, nendTime, batchValue);
         } else {
-            result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name, nstartTime, nendTime);
+            result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name, nstartTime, nendTime, batchValue);
         }
         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, Integer yearId) throws ParseException {
+    public void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, Integer accountId, Integer yearId, String batchValue) throws ParseException {
         String nstartTime = null;
         String nendTime = null;
         boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
@@ -1309,9 +1344,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             for (String s : split) {
                 collegeIds.add(s);
             }
-            result = welcomeBedService.studentAccommodationListS(schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name, nstartTime, nendTime);
+            result = welcomeBedService.studentAccommodationListS(schoolId, buildId, dormitoryId, collegeIds, majorId, classstrId, name, nstartTime, nendTime, batchValue);
         } else {
-            result = welcomeBedService.studentAccommodationList(schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name, nstartTime, nendTime);
+            result = welcomeBedService.studentAccommodationList(schoolId, buildId, dormitoryId, collegeId, majorId, classstrId, name, nstartTime, nendTime, batchValue);
         }
 
 

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

@@ -10,6 +10,7 @@ import com.template.annotation.AWelcomeTypeLog;
 import com.template.api.WelcomeDormitoryControllerAPI;
 import com.template.common.utils.BeanUtil;
 import com.template.common.utils.ExcelUtils;
+import com.template.common.utils.TimeExchange;
 import com.template.model.enumModel.eFileType;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
@@ -303,8 +304,24 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, Integer accountId) {
-
+    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, 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<WelcomeDormitoryVo> pageUtils = null;
         if (ObjectUtils.isEmpty(collegeId)) {
@@ -324,9 +341,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 //                }
 //            }
 //            String collegeIds = stringBuilder.toString();
-            pageUtils = welcomeDormitoryService.listDormitoryCPage(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState);
+            pageUtils = welcomeDormitoryService.listDormitoryCPage(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState,nstartTime,nendTime);
         } else {
-            pageUtils = welcomeDormitoryService.listDormitoryPage(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState);
+            pageUtils = welcomeDormitoryService.listDormitoryPage(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState,nstartTime,nendTime);
         }
 
 
@@ -749,7 +766,24 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, Integer accountId) {
+    public void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, 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<WelcomeDormitoryVo> result = null;
         if (ObjectUtils.isEmpty(collegeId)) {
@@ -769,9 +803,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 //                }
 //            }
 //            String collegeIds = stringBuilder.toString();
-            result = welcomeDormitoryService.listDormitoryS(schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState);
+            result = welcomeDormitoryService.listDormitoryS(schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState,nstartTime,nendTime);
         } else {
-            result = welcomeDormitoryService.listDormitory(schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState);
+            result = welcomeDormitoryService.listDormitory(schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState,nstartTime,nendTime);
         }
 
         //导出

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

@@ -30,10 +30,10 @@ public class WelcomeLogController implements WelcomeLogControllerAPI {
     private WelcomeLogService welcomeLogService;
 
     @Override
-    public CommonResult queryLogPages(Integer userId,int currentPage, int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime) {
+    public CommonResult queryLogPages(int currentPage, int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime,String content) {
 
 
-        PageUtils<LogVo> result = welcomeLogService.queryLogPages(currentPage, pageCount, userName, operMode, olevelId, startTime, endTime);
+        PageUtils<LogVo> result = welcomeLogService.queryLogPages(currentPage, pageCount, userName, operMode, olevelId, startTime, endTime,content);
 
         return CommonResult.ok(result);
     }

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

@@ -7,6 +7,7 @@ import com.template.annotation.AWelcomeLogMode;
 import com.template.annotation.AWelcomeTypeLog;
 import com.template.api.WelcomePaySettingControllerAPI;
 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.WelcomeOrg;
@@ -59,8 +60,25 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
     private WelcomePaySettingService welcomePaySettingService;
 
     @Override
-    public CommonResult getPageDatas(int currentPage, int pageCount, Integer collegeId, Integer majorId, String eduLevel) {
-        PageUtils<WelcomePaySetting> pages = welcomePaySettingService.queryPageWelcomePaySettings(currentPage, pageCount, collegeId, majorId, eduLevel);
+    public CommonResult getPageDatas(int currentPage, int pageCount, Integer collegeId, Integer majorId, String eduLevel, 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<WelcomePaySetting> pages = welcomePaySettingService.queryPageWelcomePaySettings(currentPage, pageCount, collegeId, majorId, eduLevel, nstartTime, nendTime);
         return CommonResult.ok(pages);
     }
 
@@ -69,13 +87,25 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
     @AWelcomeTypeLog("新增")
     @AWelcomeLogMode("缴费设置")
     @AWelcomeLevelLog("信息")
-    public CommonResult insertPaySetting(insertPaySettingRequest psr, BindingResult bindingResult) {
+    public CommonResult insertPaySetting(insertPaySettingRequest psr, BindingResult bindingResult) throws ParseException {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        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";
+        }
 
-        WelcomePaySetting exist = welcomePaySettingService.queryPaySettingById(psr.getCollegeId(), psr.getMajorId(), psr.getEduLevel());
+        WelcomePaySetting exist = welcomePaySettingService.queryPaySettingById(psr.getCollegeId(), psr.getMajorId(), psr.getEduLevel(), nstartTime, nendTime);
         if (exist != null) {
             return CommonResult.fail("当前院系专业已设置！");
         }
@@ -109,7 +139,11 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
             return CommonResult.fail("当前数据已失效，编辑失败！");
         }
 
-        WelcomePaySetting exist = welcomePaySettingService.queryPaySettingById(psr.getCollegeId(), psr.getMajorId(), psr.getEduLevel());
+        Integer yearId = Integer.valueOf(TimeExchange.getYear(oldData.getCreateTime()));
+        String nstartTime = yearId + "-06-01";
+        String nendTime = (yearId + 1) + "-06-01";
+
+        WelcomePaySetting exist = welcomePaySettingService.queryPaySettingById(psr.getCollegeId(), psr.getMajorId(), psr.getEduLevel(), nstartTime, nendTime);
         if (exist != null && psr.getId().intValue() != exist.getId().intValue()) {
             return CommonResult.fail("当前院系专业已设置！");
         }
@@ -171,13 +205,22 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
 
         List<WelcomePaySetting> existPays = welcomePaySettingService.queryPaySettings();
         if (existPays != null && existPays.size() > 0) {
+            //当前时间小于本年度的7月1日 说明要查去年的数据
+            boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+            Integer yearInt = Integer.valueOf(TimeExchange.getYear());
+            String nstartTime = lastYear ?  (yearInt - 1) + "-06-01" : yearInt + "-06-01";
+            String nendTime = lastYear ? yearInt + "-06-01" : (yearInt + 1) + "-06-01";
+
             for (WelcomePaySetting wps : result) {
-                int one = wps.getCollegeId().intValue();
-                int two = wps.getMajorId().intValue();
-                String theww = wps.getEduLevel();
+//                int one = wps.getCollegeId().intValue();
+//                int two = wps.getMajorId().intValue();
+//                String theww = wps.getEduLevel();
 
                 Optional<WelcomePaySetting> ows = existPays.stream().filter(e -> e.getCollegeId().intValue() == wps.getCollegeId().intValue()
-                        && e.getMajorId().intValue() == wps.getMajorId().intValue() && e.getEduLevel().equals(wps.getEduLevel())).findFirst();
+                        && e.getMajorId().intValue() == wps.getMajorId().intValue()
+                        && e.getEduLevel().equals(wps.getEduLevel())
+                        && e.getCreateTime().compareTo(TimeExchange.StringToDate(nstartTime, "yyyy-MM-dd")) >= 0
+                && e.getCreateTime().compareTo(TimeExchange.StringToDate(nendTime, "yyyy-MM-dd")) < 0).findFirst();
                 if (ows != null && ows.isPresent()) {
                     wps.setId(ows.get().getId());
                 }
@@ -396,10 +439,27 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
     }
 
     @Override
-    public void paySettingExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, String eduLevel) {
+    public void paySettingExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, String eduLevel, 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("缴费设置");
-        List<WelcomePaySetting> result = welcomePaySettingService.queryPaySettingsById(collegeId, majorId, eduLevel);
+        List<WelcomePaySetting> result = welcomePaySettingService.queryPaySettingsById(collegeId, majorId, eduLevel, nstartTime, nendTime);
 
         //导出
         Row headerRow = sheet.createRow(0);

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

@@ -495,6 +495,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         String nstartTime = null;
         String nendTime = null;
+        boolean isNowYear = false;
         boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
         if (yearId == null) {
             Integer yearInt = Integer.valueOf(TimeExchange.getYear());
@@ -502,7 +503,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             if (lastYear) {
                 nstartTime = (yearInt - 1) + "-06-01";
                 nendTime = yearInt + "-06-01";
-            } else {
+            } else {//今年
+                isNowYear = true;
                 nstartTime = yearInt + "-06-01";
                 nendTime = (yearInt + 1) + "-06-01";
             }
@@ -529,6 +531,74 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
         }
         result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered, isPay, isCheck, school, batchValue, carNumber, nstartTime, nendTime);
+
+        if (result != null && result.getList() != null && result.getList().size() > 0) {
+            List<StudentPageVo> students = result.getList().stream().filter(e -> e.getIsPay().intValue() == 0).collect(Collectors.toList());
+            //只处理本学期的未达标人员的数据同步一下支付数据
+            if (students != null && students.size() > 0 && isNowYear) {
+                List<PayDetailsVo> pdvs = new ArrayList<>();
+                List<Integer> ids = new ArrayList<>();
+                for (StudentPageVo student : students) {
+
+                    List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(student.getAdmissNum(), TimeExchange.getYear());
+                    BigDecimal payAmount = new BigDecimal(BigInteger.ZERO);//实缴金额
+                    BigDecimal yjPayAmount = new BigDecimal(BigInteger.ZERO);//应缴金额
+                    BigDecimal dkAmount = new BigDecimal(BigInteger.ZERO);//贷款金额
+                    for (JsonPayVo pi : payInfos) {
+                        dkAmount = dkAmount.add(pi.getDKJE());
+                        payAmount = payAmount.add(pi.getSJJE());
+                        yjPayAmount = yjPayAmount.add(pi.getYJJE());
+                    }
+                    BigDecimal studentPay = payAmount.add(dkAmount);
+                    student.setPayAmount(studentPay);
+                    student.setAmountPayable(yjPayAmount);
+                    System.out.println("进支付比较1" + JSON.toJSON(payInfos));
+                    if (payInfos != null && payInfos.size() > 0) {
+                        System.out.println("进支付比较2");
+                        WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue(), nstartTime, nendTime);
+                        System.out.println("进支付比较3" + JSON.toJSON(paySettings));
+                        if (paySettings != null) {
+                            System.out.println("进支付比较4");
+
+                            if (studentPay.compareTo(paySettings.getPayAmount()) >= 0) {
+                                student.setIsPay(1);
+                                ids.add(student.getId());
+                                PayDetailsVo pdv = new PayDetailsVo();
+                                pdv.setId(student.getId());
+                                pdv.setPayAmount(studentPay);
+                                pdv.setAmountPayable(yjPayAmount);
+                                pdvs.add(pdv);
+                            } else {
+                                student.setIsPay(0);
+                            }
+                        } else {
+                            student.setIsPay(0);
+                        }
+                    } else {
+                        student.setIsPay(0);
+                    }
+                }
+                if (ids != null && ids.size() > 0) {
+                    List<WelcomeStudent> studentDatas = welcomeStudentService.queryStudents(ids);
+                    if(studentDatas != null && studentDatas.size() > 0){
+                        for (WelcomeStudent ws:studentDatas){
+                            Optional<PayDetailsVo> opdv = pdvs.stream().filter(e -> e.getId().intValue() == ws.getId().intValue()).findFirst();
+                            if(opdv != null && opdv.isPresent()){
+                                ws.setAmountPayable(opdv.get().getAmountPayable());
+                                ws.setPayAmount(opdv.get().getPayAmount());
+                            }
+                            ws.setIsPay(1);
+                        }
+                        boolean update = welcomeStudentService.updateBatchById(studentDatas);
+                        if (!update) {
+                            logger.error("获取支付信息导致学校信息查询失败");
+                            return CommonResult.fail("查询失败");
+                        }
+                    }
+                }
+            }
+        }
+
         return CommonResult.ok(result);
     }
 
@@ -761,7 +831,19 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             System.out.println("进支付比较1" + JSON.toJSON(payInfos));
             if (payInfos != null && payInfos.size() > 0) {
                 System.out.println("进支付比较2");
-                WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(ws.getCollegeId(), ws.getMajorId(), ws.getBatchValue());
+                String nstartTime = null;
+                String nendTime = null;
+                boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+                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";
+                }
+                WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(ws.getCollegeId(), ws.getMajorId(), ws.getBatchValue(), nstartTime, nendTime);
                 System.out.println("进支付比较3" + JSON.toJSON(paySettings));
                 if (paySettings != null) {
                     System.out.println("进支付比较4");
@@ -1719,7 +1801,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //BigDecimal total = new BigDecimal(enrollmentTotal);
         //BigDecimal bedTotal = new BigDecimal(checkInBedTotal);
         //BigDecimal bigDecimal = bedTotal.divide(total).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
-        Double result = enrollmentTotal<= 0 ? 0 : ((double) checkInBedTotal / enrollmentTotal) * 100;
+        Double result = enrollmentTotal <= 0 ? 0 : ((double) checkInBedTotal / enrollmentTotal) * 100;
         String registrationRate = String.format("%.2f", result);
 
 
@@ -1888,7 +1970,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryStudentByToken(String userId) {
+    public CommonResult queryStudentByToken(String userId) throws ParseException {
         WelcomeStudent student = welcomeStudentService.getManageById(Integer.valueOf(userId));
         if (student == null) {
             return CommonResult.fail("558", "学生信息已失效，查询失败");
@@ -1958,7 +2040,19 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             System.out.println("进支付比较1" + JSON.toJSON(payInfos));
             if (payInfos != null && payInfos.size() > 0) {
                 System.out.println("进支付比较2");
-                WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue());
+                String nstartTime = null;
+                String nendTime = null;
+                boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+                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";
+                }
+                WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(student.getCollegeId(), student.getMajorId(), student.getBatchValue(), nstartTime, nendTime);
                 System.out.println("进支付比较3" + JSON.toJSON(paySettings));
                 if (paySettings != null) {
                     System.out.println("进支付比较4");
@@ -1994,7 +2088,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryStudentInfo(String admissNum) {
+    public CommonResult queryStudentInfo(String admissNum) throws ParseException {
         WelcomeStudent ws = welcomeStudentService.getDataByNum(admissNum);
         if (ws == null) {
             return CommonResult.fail("558", "当前学生信息已失效，查询失败");
@@ -2070,7 +2164,19 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         System.out.println("进支付比较1" + JSON.toJSON(payInfos));
         if (payInfos != null && payInfos.size() > 0) {
             System.out.println("进支付比较2");
-            WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(ws.getCollegeId(), ws.getMajorId(), ws.getBatchValue());
+            String nstartTime = null;
+            String nendTime = null;
+            boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+            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";
+            }
+            WelcomePaySetting paySettings = welcomePaySettingService.queryPaySettingById(ws.getCollegeId(), ws.getMajorId(), ws.getBatchValue(), nstartTime, nendTime);
             System.out.println("进支付比较3" + JSON.toJSON(paySettings));
             if (paySettings != null) {
                 System.out.println("进支付比较4");

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

@@ -9,6 +9,7 @@ import com.template.annotation.AWelcomeTypeLog;
 import com.template.api.WelcomeVisitorControllerAPI;
 import com.template.common.exception.MyCustomException;
 import com.template.common.result.ResponseStatusEnum;
+import com.template.common.utils.TimeExchange;
 import com.template.model.query.WelcomeVisitorQuery;
 import com.template.model.request.WelcomeVisitorRequest;
 import com.template.model.result.CommonResult;
@@ -18,10 +19,12 @@ import com.template.services.WelcomeVisitorService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
  * 访客相关接口
+ *
  * @author codingliang
  * @date 2025-06-16
  */
@@ -65,8 +68,25 @@ public class WelcomeVisitorController implements WelcomeVisitorControllerAPI {
     }
 
     @Override
-    public CommonResult<PageUtils<WelcomeVisitorVO>> page(WelcomeVisitorQuery visitorQuery) {
-        PageUtils<WelcomeVisitorVO> pages = welcomeVisitorService.page(visitorQuery);
+    public CommonResult<PageUtils<WelcomeVisitorVO>> page(WelcomeVisitorQuery visitorQuery) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (visitorQuery.getYearId() == 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 = visitorQuery.getYearId() + "-06-01";
+            nendTime = (visitorQuery.getYearId() + 1) + "-06-01";
+        }
+        PageUtils<WelcomeVisitorVO> pages = welcomeVisitorService.page(visitorQuery, nstartTime, nendTime);
         return CommonResult.ok(pages);
     }
 
@@ -110,7 +130,24 @@ public class WelcomeVisitorController implements WelcomeVisitorControllerAPI {
     }
 
     @Override
-    public void export(WelcomeVisitorQuery visitorQuery) {
-        welcomeVisitorService.export(visitorQuery);
+    public void export(WelcomeVisitorQuery visitorQuery) throws ParseException {
+        String nstartTime = null;
+        String nendTime = null;
+        boolean lastYear = TimeExchange.CompareDate(TimeExchange.getDate(), TimeExchange.getYear() + "-07-01", "yyyy-MM-dd");
+        if (visitorQuery.getYearId() == 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 = visitorQuery.getYearId() + "-06-01";
+            nendTime = (visitorQuery.getYearId() + 1) + "-06-01";
+        }
+        welcomeVisitorService.export(visitorQuery,nstartTime,nendTime);
     }
 }

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

@@ -37,8 +37,8 @@ public interface WelcomeBedMapper extends BaseMapper<WelcomeBed> {
 
     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, @Param("nstartTime") String nstartTime, @Param("nendTime") String nendTime);
 
-    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, @Param("nstartTime") String nstartTime, @Param("nendTime") String nendTime);
 
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ceshi
@@ -24,27 +24,27 @@ import java.util.List;
 public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
 
 
-    List<WelcomeDormitoryVo> listDormitory( @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
-                                            @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeId") Integer collegeId,
-                                            @Param("status") Integer status,@Param("retentionState") Integer retentionState);
+    List<WelcomeDormitoryVo> listDormitory(@Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
+                                           @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeId") Integer collegeId,
+                                           @Param("status") Integer status, @Param("retentionState") Integer retentionState, @Param("nstartTime") String nstartTime, @Param("nendTime") String nendTime);
 
     StudentStayVo getTotalCount(@Param("buildId") Integer buildId);
 
     IPage<WelcomeDormitoryVo> listDormitoryPage(Page<WelcomeDormitoryVo> page, @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
                                                 @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeId") Integer collegeId,
-                                                @Param("status") Integer status,@Param("retentionState") Integer retentionState);
+                                                @Param("status") Integer status, @Param("retentionState") Integer retentionState, @Param("nstartTime") String nstartTime, @Param("nendTime") String nendTime);
 
     IPage<WelcomeDormitoryVo> listDormitoryCPage(Page<WelcomeDormitoryVo> page, @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
-                                                @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeIds") String collegeIds,
-                                                @Param("status") Integer status,@Param("retentionState") Integer retentionState);
+                                                 @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeIds") String collegeIds,
+                                                 @Param("status") Integer status, @Param("retentionState") Integer retentionState, @Param("nstartTime") String nstartTime, @Param("nendTime") String nendTime);
 
     List<WelcomeDormitoryVo> listDormitoryS(@Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
                                             @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeIds") String collegeIds,
-                                            @Param("status") Integer status,@Param("retentionState") Integer retentionState);
+                                            @Param("status") Integer status, @Param("retentionState") Integer retentionState, @Param("nstartTime") String nstartTime, @Param("nendTime") String nendTime);
 
-    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);
 
-    List<WelcomeDormitory> saveBedDormitoryGroup(@Param("schoolId") Integer schoolId,@Param("buildId")  Integer buildId,@Param("collegeIds") String collegeIds);
+    List<WelcomeDormitory> saveBedDormitoryGroup(@Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId, @Param("collegeIds") String collegeIds);
 
-    List<WelcomeDormitory> saveBedBuildGroup(@Param("schoolId") Integer schoolId,@Param("collegeIds") String collegeIds);
+    List<WelcomeDormitory> saveBedBuildGroup(@Param("schoolId") Integer schoolId, @Param("collegeIds") String collegeIds);
 }

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

@@ -17,5 +17,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WelcomeLogMapper extends BaseMapper<WelcomeLog> {
-    IPage<LogVo> queryLogPages(IPage<LogVo> page, @Param("userName") String userName, @Param("operMode") String operMode, @Param("olevelId") Integer olevelId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<LogVo> queryLogPages(IPage<LogVo> page, @Param("userName") String userName, @Param("operMode") String operMode, @Param("olevelId") Integer olevelId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("content") String content);
 }

src/main/java/com/template/model/query/WelcomeVisitorQuery.java

@@ -27,4 +27,7 @@ public class WelcomeVisitorQuery extends PageQuery {
 
     @ApiModelProperty(value = "结束时间")
     private String endTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Integer yearId;
 }

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

@@ -0,0 +1,24 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class PayDetailsVo {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "应缴金额")
+    private BigDecimal amountPayable;
+
+    @ApiModelProperty(value = "实付金额")
+    private BigDecimal payAmount;
+}

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

@@ -1,6 +1,7 @@
 package com.template.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,4 +82,20 @@ public class StudentPageVo {
     @ApiModelProperty(value = "到站日期")
     private String arrvieDate;
 
+    //是否已缴费 未缴费：0，已缴费：1；
+    @JsonIgnore
+    @ApiModelProperty(value = "是否已缴费")
+    private Integer isPay;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "院系ID")
+    private Integer collegeId;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "专业ID")
+    private Integer majorId;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "层次")
+    private String batchValue;
 }

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

@@ -21,7 +21,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     int updateWelcomeBed(WelcomeBed rns);
 
-    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);
+    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, String nstartTime, String nendTime);
 
     int deleteWelcomeBedById(int id);
 
@@ -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, String nstartTime, String nendTime);
 
     WelcomeBed getBedByCardId(String studentCard);
 
@@ -47,13 +47,13 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     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, String startTime, String endTime);
+    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,String batchValue);
 
-    List<WelcomeBed> studentAccommodationList(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, String startTime, String endTime,String batchValue);
 
-    List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex,String startTime,String endTime);
+    List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex, String startTime, String endTime);
 
-    List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex,String startTime,String endTime);
+    List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex, String startTime, String endTime);
 
     void updateData(Integer bedId);
 
@@ -77,14 +77,14 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
 
-    PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
+    PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState, String nstartTime, String nendTime);
 
 
-    List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
+    List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState, String nstartTime, String nendTime);
 
-    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);
+    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,String batchValue);
 
-    List<WelcomeBed> studentAccommodationListS(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, String startTime, String endTime,String batchValue);
 
     List<BedInfosVo> queryBedList(String studentCard);
 

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author ceshi
@@ -29,7 +29,7 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     WelcomeDormitory getManageById(String id);
 
-    List<WelcomeDormitoryVo> listDormitory( Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState);
+    List<WelcomeDormitoryVo> listDormitory(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, String nstartTime, String nendTime);
 
     List<WelcomeDormitory> dormitoryGroup(Integer schoolId, Integer buildId);
 
@@ -37,19 +37,19 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     List<WelcomeDormitory> collegeDormitoryCollegeGroup(Integer schoolId, Integer buildId, Integer collegeId);
 
-    PageUtils<WelcomeDormitoryVo> listDormitoryPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState);
+    PageUtils<WelcomeDormitoryVo> listDormitoryPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, String nstartTime, String nendTime);
 
     WelcomeDormitory queryExistDormotory(Integer schoolId, Integer buildId, String dormitory);
 
-    PageUtils<WelcomeDormitoryVo> listDormitoryCPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState);
+    PageUtils<WelcomeDormitoryVo> listDormitoryCPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState, String nstartTime, String nendTime);
 
     List<WelcomeDormitory> saveBedBuildGroup(Integer schoolId, String collegeIds);
 
-    List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState);
+    List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState, String nstartTime, String nendTime);
 
     List<WelcomeDormitory> dormitoryTGroup(Integer schoolId, Integer buildId);
 
-    List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, Integer buildId,String collegeIds);
+    List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, Integer buildId, String collegeIds);
 
-    void updateBuild(String schoolId, Integer buildId,String build,String school);
+    void updateBuild(String schoolId, Integer buildId, String build, String school);
 }

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

@@ -22,5 +22,5 @@ public interface WelcomeLogService extends IService<WelcomeLog> {
 
     int updateWelcomeLog(WelcomeLog wl);
 
-    PageUtils<LogVo> queryLogPages(int currentPage, int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime);
+    PageUtils<LogVo> queryLogPages(int currentPage, int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime,String content);
 }

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

@@ -19,7 +19,7 @@ public interface WelcomePaySettingService extends IService<WelcomePaySetting> {
 
     int updateWelcomePaySetting(WelcomePaySetting rns);
 
-    PageUtils<WelcomePaySetting> queryPageWelcomePaySettings(int currentPage, int pageCount, Integer collegeId, Integer majorId, String eduLevel);
+    PageUtils<WelcomePaySetting> queryPageWelcomePaySettings(int currentPage, int pageCount, Integer collegeId, Integer majorId, String eduLevel, String nstartTime, String nendTime);
 
     int deleteWelcomePaySettingById(String id);
 
@@ -33,9 +33,9 @@ public interface WelcomePaySettingService extends IService<WelcomePaySetting> {
 
     List<WelcomePaySetting> queryPaySettings();
 
-    WelcomePaySetting queryPaySettingById(Integer collegeId, Integer majorId, String eduLevel);
+    WelcomePaySetting queryPaySettingById(Integer collegeId, Integer majorId, String eduLevel, String nstartTime, String nendTime);
 
-    List<WelcomePaySetting> queryPaySettingsById(Integer collegeId, Integer majorId, String eduLevel);
+    List<WelcomePaySetting> queryPaySettingsById(Integer collegeId, Integer majorId, String eduLevel, String nstartTime, String nendTime);
 
     WelcomePaySetting getManageById(Integer id);
 }

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

@@ -31,13 +31,13 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     WelcomeStudent getDataByIdcard(String cardId);
 
-    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus, Integer isRegistered, Integer isPay, Integer isCheck, String school, String batchValue, Integer carNumber,String startTime,String endTime);
+    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,String startTime,String endTime);
+    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);
 
@@ -84,4 +84,8 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
     Integer getLevelTotalCount(String batchValue, Integer collegeId, String startTime, String endTime);
 
     int studentTotalCount(Integer collegeId, String startTime, String endTime);
+
+    int updateStudents(List<Integer> ids);
+
+    List<WelcomeStudent> queryStudents(List<Integer> ids);
 }

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

@@ -67,12 +67,12 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
      * @param visitorQuery 分页条件
      * @return 分页结果
      */
-    PageUtils<WelcomeVisitorVO> page(WelcomeVisitorQuery visitorQuery);
+    PageUtils<WelcomeVisitorVO> page(WelcomeVisitorQuery visitorQuery, String nstartTime, String nendTime);
 
     /**
      * 导出访客记录
      */
-    void export(WelcomeVisitorQuery visitorQuery);
+    void export(WelcomeVisitorQuery visitorQuery, String nstartTime, String nendTime);
 
     Integer countTotal(String start, String end, Integer schoolId, String nstartTime, String nendTime);
 

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, String nstartTime, String nendTime) {
 //        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, nstartTime, nendTime);
         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, String nstartTime, String nendTime) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -100,6 +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.between("create_time", nstartTime, nendTime);
         queryWrapper.orderByAsc("build", "dormitory", "number");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
@@ -182,7 +183,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    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) {
+    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,String batchValue) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -194,13 +195,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.like(name != null, "name", name);
         queryWrapper.eq("is_check", 1);
         queryWrapper.between("create_time", startTime, endTime);
+        queryWrapper.inSql(StringUtils.hasText(batchValue), "card_num", "select admiss_num from welcome_student where deleted = 0 and batch_value = '" + batchValue + "'");
         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, String startTime, String endTime) {
+    public List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name, String startTime, String endTime,String batchValue) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -211,14 +213,15 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.like(name != null, "name", name);
         queryWrapper.eq("is_check", 1);
         queryWrapper.between("create_time", startTime, endTime);
+        queryWrapper.inSql(StringUtils.hasText(batchValue), "card_num", "select admiss_num from welcome_student where deleted = 0 and batch_value = '" + batchValue + "'");
         queryWrapper.orderByDesc("create_time");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
 
     @Override
-    public List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex,String startTime,String endTime) {
-        List<BedSqlTotalVo> result = welcomeBedMapper.queryBedSqlList(collegeId, sex,startTime,endTime);
+    public List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex, String startTime, String endTime) {
+        List<BedSqlTotalVo> result = welcomeBedMapper.queryBedSqlList(collegeId, sex, startTime, endTime);
         return result;
     }
 
@@ -367,7 +370,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
+    public PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState, String nstartTime, String nendTime) {
 //        Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
 //        QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -384,12 +387,12 @@ 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, nstartTime, nendTime);
         return new PageUtils<>(result);
     }
 
     @Override
-    public List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
+    public List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState, String nstartTime, String nendTime) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -400,13 +403,14 @@ 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.between("create_time", nstartTime, nendTime);
         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, String startTime, String endTime) {
+    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,String batchValue) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -418,13 +422,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.like(name != null, "name", name);
         queryWrapper.eq("is_check", 1);
         queryWrapper.between("create_time", startTime, endTime);
+        queryWrapper.inSql(StringUtils.hasText(batchValue), "card_num", "select admiss_num from welcome_student where deleted = 0 and batch_value = '" + batchValue + "'");
         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, String startTime, String endTime) {
+    public List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name, String startTime, String endTime, String batchValue) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -435,6 +440,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.like(name != null, "name", name);
         queryWrapper.eq("is_check", 1);
         queryWrapper.between("create_time", startTime, endTime);
+        queryWrapper.inSql(StringUtils.hasText(batchValue), "card_num", "select admiss_num from welcome_student where deleted = 0 and batch_value = '" + batchValue + "'");
         queryWrapper.orderByDesc("create_time");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;

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

@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -52,7 +52,7 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         Page<WelcomeDormitory> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeDormitory> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("update_time");
-        IPage<WelcomeDormitory> result = welcomeDormitoryMapper.selectPage(page,queryWrapper);
+        IPage<WelcomeDormitory> result = welcomeDormitoryMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
@@ -70,9 +70,9 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
 
 
     @Override
-    public List<WelcomeDormitoryVo> listDormitory( Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState) {
+    public List<WelcomeDormitoryVo> listDormitory(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, String nstartTime, String nendTime) {
 
-        List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(schoolId,buildId,dormitoryId,sex,collegeId,status,retentionState);
+        List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState, nstartTime, nendTime);
         return result;
     }
 
@@ -81,7 +81,7 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
                 .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId)
-                .eq(WelcomeDormitory::getRetentionState,1);
+                .eq(WelcomeDormitory::getRetentionState, 1);
         List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
         return welcomeDormitories;
     }
@@ -96,33 +96,33 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
                 .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId)
-                .eq(WelcomeDormitory::getCollegeId,collegeId)
-                .eq(WelcomeDormitory::getRetentionState,1);
+                .eq(WelcomeDormitory::getCollegeId, collegeId)
+                .eq(WelcomeDormitory::getRetentionState, 1);
         List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
         return welcomeDormitories;
     }
 
     @Override
-    public PageUtils<WelcomeDormitoryVo> listDormitoryPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState) {
+    public PageUtils<WelcomeDormitoryVo> listDormitoryPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState, String nstartTime, String nendTime) {
         Page<WelcomeDormitoryVo> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryPage(page,schoolId,buildId,dormitoryId,sex,collegeId,status,retentionState);
+        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryPage(page, schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState, nstartTime, nendTime);
         return new PageUtils<>(result);
     }
 
     @Override
     public WelcomeDormitory queryExistDormotory(Integer schoolId, Integer buildId, String dormitory) {
         QueryWrapper<WelcomeDormitory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school_id",schoolId);
-        queryWrapper.eq("build_id",buildId);
-        queryWrapper.eq("dormitory",dormitory);
+        queryWrapper.eq("school_id", schoolId);
+        queryWrapper.eq("build_id", buildId);
+        queryWrapper.eq("dormitory", dormitory);
         WelcomeDormitory result = welcomeDormitoryMapper.selectOne(queryWrapper);
         return result;
     }
 
     @Override
-    public PageUtils<WelcomeDormitoryVo> listDormitoryCPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState) {
+    public PageUtils<WelcomeDormitoryVo> listDormitoryCPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState, String nstartTime, String nendTime) {
         Page<WelcomeDormitoryVo> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryCPage(page,schoolId,buildId,dormitoryId,sex,collegeIds,status,retentionState);
+        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryCPage(page, schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState, nstartTime, nendTime);
         return new PageUtils<>(result);
     }
 
@@ -133,13 +133,13 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
 //                .in(WelcomeDormitory::getCollegeId,collegeIds)
 //                .groupBy(WelcomeDormitory::getSchoolId,WelcomeDormitory::getBuildId);
 //        List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
-        List<WelcomeDormitory> result = welcomeDormitoryMapper.saveBedBuildGroup(schoolId,collegeIds);
+        List<WelcomeDormitory> result = welcomeDormitoryMapper.saveBedBuildGroup(schoolId, collegeIds);
         return result;
     }
 
     @Override
-    public List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState) {
-        List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryS(schoolId,buildId,dormitoryId,sex,collegeIds,status,retentionState);
+    public List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState, String nstartTime, String nendTime) {
+        List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryS(schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState, nstartTime, nendTime);
         return result;
     }
 
@@ -148,7 +148,7 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
                 .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId)
-                .orderByDesc(WelcomeDormitory::getBuild,WelcomeDormitory::getDormitory);
+                .orderByDesc(WelcomeDormitory::getBuild, WelcomeDormitory::getDormitory);
         List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
         return welcomeDormitories;
     }
@@ -161,12 +161,12 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
 //                .in(WelcomeDormitory::getCollegeId,collegeIds)
 //                .groupBy(WelcomeDormitory::getSchoolId,WelcomeDormitory::getBuildId,WelcomeDormitory::getDormitory);
 //        List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
-        List<WelcomeDormitory> result = welcomeDormitoryMapper.saveBedDormitoryGroup(schoolId,buildId,collegeIds);
+        List<WelcomeDormitory> result = welcomeDormitoryMapper.saveBedDormitoryGroup(schoolId, buildId, collegeIds);
         return result;
     }
 
     @Override
-    public void updateBuild(String schoolId, Integer buildId,String build,String school) {
-        welcomeDormitoryMapper.updateBuild(schoolId,buildId,build,school);
+    public void updateBuild(String schoolId, Integer buildId, String build, String school) {
+        welcomeDormitoryMapper.updateBuild(schoolId, buildId, build, school);
     }
 }

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

@@ -226,9 +226,9 @@ public class WelcomeLogServiceImpl extends ServiceImpl<WelcomeLogMapper, Welcome
     }
 
     @Override
-    public PageUtils<LogVo> queryLogPages(int currentPage, int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime) {
+    public PageUtils<LogVo> queryLogPages(int currentPage, int pageCount, String userName, String operMode, Integer olevelId, String startTime, String endTime,String content) {
         Page<LogVo> page = new Page<>(currentPage, pageCount);
-        IPage<LogVo> result = welcomeLogMapper.queryLogPages(page, userName, operMode, olevelId, startTime, endTime);
+        IPage<LogVo> result = welcomeLogMapper.queryLogPages(page, userName, operMode, olevelId, startTime, endTime,content);
         return new PageUtils(result);
     }
 }

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

@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -41,14 +41,15 @@ public class WelcomePaySettingServiceImpl extends ServiceImpl<WelcomePaySettingM
     }
 
     @Override
-    public PageUtils<WelcomePaySetting> queryPageWelcomePaySettings(int currentPage, int pageCount, Integer collegeId, Integer majorId, String eduLevel) {
+    public PageUtils<WelcomePaySetting> queryPageWelcomePaySettings(int currentPage, int pageCount, Integer collegeId, Integer majorId, String eduLevel, String nstartTime, String nendTime) {
         Page<WelcomePaySetting> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomePaySetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(collegeId != null && collegeId > 0 , "college_id", collegeId);
-        queryWrapper.eq(majorId != null && majorId > 0 , "major_id", majorId);
-        queryWrapper.eq(StringUtils.hasText(eduLevel) , "edu_level", eduLevel);
+        queryWrapper.eq(collegeId != null && collegeId > 0, "college_id", collegeId);
+        queryWrapper.eq(majorId != null && majorId > 0, "major_id", majorId);
+        queryWrapper.eq(StringUtils.hasText(eduLevel), "edu_level", eduLevel);
+        queryWrapper.between("create_time", nstartTime, nendTime);
         queryWrapper.orderByDesc("college_id");
-        IPage<WelcomePaySetting> result = welcomePaySettingMapper.selectPage(page,queryWrapper);
+        IPage<WelcomePaySetting> result = welcomePaySettingMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
@@ -73,7 +74,7 @@ public class WelcomePaySettingServiceImpl extends ServiceImpl<WelcomePaySettingM
     @Override
     public int deleteAll() {
         QueryWrapper<WelcomePaySetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("deleted",0);
+        queryWrapper.eq("deleted", 0);
         int result = welcomePaySettingMapper.delete(queryWrapper);
         return result;
     }
@@ -81,8 +82,8 @@ public class WelcomePaySettingServiceImpl extends ServiceImpl<WelcomePaySettingM
     @Override
     public List<WelcomePaySetting> queryPaySettings(String school) {
         QueryWrapper<WelcomePaySetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school",school);
-        queryWrapper.eq("is_check",1);
+        queryWrapper.eq("school", school);
+        queryWrapper.eq("is_check", 1);
         List<WelcomePaySetting> result = welcomePaySettingMapper.selectList(queryWrapper);
         return result;
     }
@@ -94,21 +95,23 @@ public class WelcomePaySettingServiceImpl extends ServiceImpl<WelcomePaySettingM
     }
 
     @Override
-    public WelcomePaySetting queryPaySettingById(Integer collegeId, Integer majorId, String eduLevel) {
+    public WelcomePaySetting queryPaySettingById(Integer collegeId, Integer majorId, String eduLevel,String nstartTime,String nendTime) {
         QueryWrapper<WelcomePaySetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(collegeId != null && collegeId > 0 , "college_id", collegeId);
-        queryWrapper.eq(majorId != null && majorId > 0 , "major_id", majorId);
-        queryWrapper.eq(StringUtils.hasText(eduLevel) , "edu_level", eduLevel);
+        queryWrapper.eq(collegeId != null && collegeId > 0, "college_id", collegeId);
+        queryWrapper.eq(majorId != null && majorId > 0, "major_id", majorId);
+        queryWrapper.eq(StringUtils.hasText(eduLevel), "edu_level", eduLevel);
+        queryWrapper.between("create_time", nstartTime, nendTime);
         WelcomePaySetting result = welcomePaySettingMapper.selectOne(queryWrapper);
         return result;
     }
 
     @Override
-    public List<WelcomePaySetting> queryPaySettingsById(Integer collegeId, Integer majorId, String eduLevel) {
+    public List<WelcomePaySetting> queryPaySettingsById(Integer collegeId, Integer majorId, String eduLevel, String nstartTime, String nendTime) {
         QueryWrapper<WelcomePaySetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(collegeId != null && collegeId > 0 , "college_id", collegeId);
-        queryWrapper.eq(majorId != null && majorId > 0 , "major_id", majorId);
-        queryWrapper.eq(StringUtils.hasText(eduLevel) , "edu_level", eduLevel);
+        queryWrapper.eq(collegeId != null && collegeId > 0, "college_id", collegeId);
+        queryWrapper.eq(majorId != null && majorId > 0, "major_id", majorId);
+        queryWrapper.eq(StringUtils.hasText(eduLevel), "edu_level", eduLevel);
+        queryWrapper.between("create_time", nstartTime, nendTime);
         List<WelcomePaySetting> result = welcomePaySettingMapper.selectList(queryWrapper);
         return result;
     }

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

@@ -3,6 +3,7 @@ package com.template.services.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -258,4 +259,24 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
         Integer count = welcomeStudentMapper.selectCount(wrapper);
         return count == null ? 0 : count;
     }
+
+    @Override
+    public int updateStudents(List<Integer> ids) {
+        WelcomeStudent student = new WelcomeStudent();
+        student.setIsPay(1);
+        UpdateWrapper<WelcomeStudent> wrapper = new UpdateWrapper<>();
+        wrapper.in("id",ids);
+
+        int rows = welcomeStudentMapper.update(student, wrapper);
+        System.out.println("更新了 " + rows + " 条记录");
+        return rows;
+    }
+
+    @Override
+    public List<WelcomeStudent> queryStudents(List<Integer> ids) {
+        QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in(ids != null && ids.size() > 0, "id", ids);//身份证号
+        List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
+        return result;
+    }
 }

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

@@ -244,11 +244,12 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     }
 
     @Override
-    public PageUtils<WelcomeVisitorVO> page(WelcomeVisitorQuery visitorQuery) {
+    public PageUtils<WelcomeVisitorVO> page(WelcomeVisitorQuery visitorQuery, String nstartTime, String nendTime) {
         LambdaQueryWrapper<WelcomeVisitor> wrapper = new LambdaQueryWrapper<>();
         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(nstartTime) && StrUtil.isNotBlank(nendTime), WelcomeVisitor::getCreateTime, nstartTime, nendTime);
         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);
@@ -258,10 +259,11 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     }
 
     @Override
-    public void export(WelcomeVisitorQuery visitorQuery) {
+    public void export(WelcomeVisitorQuery visitorQuery, String nstartTime, String nendTime) {
         LambdaQueryWrapper<WelcomeVisitor> wrapper = new LambdaQueryWrapper<>();
         wrapper.orderByDesc(WelcomeVisitor::getId);
         wrapper.eq(StrUtil.isNotBlank(visitorQuery.getSchool()), WelcomeVisitor::getSchool, visitorQuery.getSchool());
+        wrapper.between(StrUtil.isNotBlank(nstartTime) && StrUtil.isNotBlank(nendTime), WelcomeVisitor::getCreateTime, nstartTime, nendTime);
         wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime()) && StrUtil.isNotBlank(visitorQuery.getEndTime()), WelcomeVisitor::getStartTime, visitorQuery.getStartTime(), visitorQuery.getEndTime());
         List<WelcomeVisitor> welcomeVisitors = list(wrapper);
 

src/main/resources/application-dev.yml

@@ -15,8 +15,8 @@ spring:
     time-zone: GMT+8
   datasource:
     username: root
-    password: Chuanghai2024.
-    url: jdbc:mysql://172.16.40.126:3306/welcome?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    password: root
+    url: jdbc:mysql://localhost:3306/welcome?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: prod
+      active: dev
   main:
     allow-circular-references: true
   servlet:

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

@@ -194,7 +194,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wb.retention_state = #{retentionState}
         </if>
-
+        AND wb.create_time between #{nstartTime} and #{nendTime}
         AND FIND_IN_SET(wb.college_id,#{collegeIds})
         order by LPAD(wb.build, 20, '0'),wb.dormitory,wb.number asc
     </select>
@@ -240,7 +240,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wb.retention_state = #{retentionState}
         </if>
-
+        AND wb.create_time between #{nstartTime} and #{nendTime}
         order by LPAD(wb.build, 20, '0'),wb.dormitory,wb.number asc
     </select>
 </mapper>

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

@@ -57,6 +57,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wd.retention_state = #{retentionState}
         </if>
+        AND wd.create_time between #{nstartTime} and #{nendTime}
         order by wd.build,wd.dormitory asc
     </select>
     <select id="getTotalCount" resultType="com.template.model.vo.StudentStayVo">
@@ -117,6 +118,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wd.retention_state = #{retentionState}
         </if>
+        AND wd.create_time between #{nstartTime} and #{nendTime}
         order by LPAD(wd.build, 20, '0'),wd.dormitory asc
     </select>
     <select id="listDormitoryCPage" resultType="com.template.model.vo.WelcomeDormitoryVo">
@@ -160,6 +162,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wd.retention_state = #{retentionState}
         </if>
+        AND wd.create_time between #{nstartTime} and #{nendTime}
         and  wd.college_id in (${collegeIds})
         order by LPAD(wd.build, 20, '0'),wd.dormitory asc
     </select>
@@ -204,6 +207,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wd.retention_state = #{retentionState}
         </if>
+        AND wd.create_time between #{nstartTime} and #{nendTime}
         and  wd.college_id in (${collegeIds})
         order by wd.build,wd.dormitory asc
     </select>

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

@@ -27,6 +27,9 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and create_time BETWEEN #{startTime} AND #{endTime}
         </if>
+        <if test="content != null and content != ''">
+            and operation like '%' #{content} '%'
+        </if>
         order by create_time desc
     </select>
 </mapper>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.template.mapper.WelcomeStudentMapper">
     <resultMap type="com.template.model.vo.StudentPageVo" id="studentPageMap">
         <result property="id" column="id"/>
+        <result property="sex" column="sex"/>
         <result property="admissNum" column="admiss_num"/>
         <result property="name" column="name"/>
         <result property="cardId" column="card_id"/>
@@ -11,12 +12,21 @@
         <result property="classstr" column="classstr"/>
         <result property="trafficMethod" column="traffic_method"/>
         <result property="arrive" column="arrive"/>
+        <result property="accompanyNum" column="accompanyNum"/>
+        <result property="fillStatus" column="fill_status"/>
         <result property="amountPayable" column="amount_payable"/>
         <result property="payAmount" column="pay_amount"/>
         <result property="dormitory" column="dormitory"/>
-        <result property="fillStatus" column="fill_status"/>
-        <result property="accompanyNum" column="accompanyNum"/>
-        <result property="sex" column="sex"/>
+        <result property="isRegistered" column="isRegistered"/>
+        <result property="carNumber" column="carNumber"/>
+        <result property="phone" column="phone"/>
+        <result property="familyName" column="familyName"/>
+        <result property="familyPhone" column="familyPhone"/>
+        <result property="arrvieDate" column="arrvieDate"/>
+        <result property="isPay" column="is_pay"/>
+        <result property="collegeId" column="college_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="batchValue" column="batch_value"/>
     </resultMap>
 
     <select id="queryStudentPageList" resultType="com.template.model.vo.StudentPageVo" resultMap="studentPageMap">
@@ -24,7 +34,7 @@
         ws.id,ws.admiss_num,ws.name,ws.card_id,ws.college,ws.major,ws.classstr,
         ws.traffic_method,ws.arrive,ws.amount_payable,ws.pay_amount,ws.fill_status,
         CONCAT(wsd.build, '-', wsd.dormitory, '-', wsd.number) as dormitory,ws.sex,ws.is_registered as isRegistered,wv.car_number as carNumber,ws.phone,wf.`name` as familyName,
-        wf.phone as familyPhone,ws.arrvie_date as arrvieDate
+        wf.phone as familyPhone,ws.arrvie_date as arrvieDate,ws.is_pay,ws.college_id,ws.major_id,ws.batch_value
         from welcome_student ws
         left join welcome_bed wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
         left join welcome_visitor wv on wv.deleted =0 and wv.student_card = ws.card_id