更新

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

@@ -31,7 +31,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/queryPageStudents")
     @ApiOperation(value = "学生信息分页数据", notes = "学生信息分页数据", httpMethod = "GET")
-    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered);
+    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
 
     @GetMapping(value = "/queryStudentDetail")
     @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
@@ -55,7 +55,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "welcomeStudentExport")
     @ApiOperation(value = "导出学生信息数据", notes = "导出学生信息数据", httpMethod = "GET")
-    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus);
+    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
 
 
     @GetMapping(value = "/studentOverview")

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

@@ -891,12 +891,45 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         LambdaQueryWrapper<WelcomeBed> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(WelcomeBed::getId, bedIds);
         List<WelcomeBed> list = welcomeBedService.list(wrapper);
+        HashSet<Integer> dormitoryIds = new HashSet<Integer>();
         if (ObjectUtils.isNotEmpty(list)) {
             for (WelcomeBed welcomeBed : list) {
+                if (welcomeBed.getIsCheck() == 1) {
+                    return CommonResult.fail(welcomeBed.getDormitory() + "中的" + welcomeBed.getNumber() + "床位已入住,不能更新其状态");
+                }
                 welcomeBed.setRetentionState(batchOperationVo.getRetentionState());
+                dormitoryIds.add(welcomeBed.getDormitoryId());
             }
             welcomeBedService.updateBatchById(list);
         }
+//        获取寝室数据
+        LambdaQueryWrapper<WelcomeDormitory> wrapperWD = new LambdaQueryWrapper<>();
+        wrapperWD.in(WelcomeDormitory::getId, dormitoryIds);
+        List<WelcomeDormitory> dormitories = welcomeDormitoryService.list(wrapperWD);
+
+//        如果是开放，则直接将寝室开放
+        if (ObjectUtils.isNotEmpty(dormitories)) {
+            if (batchOperationVo.getRetentionState() == 1) {
+                for (WelcomeDormitory dormitory : dormitories) {
+                    dormitory.setRetentionState(batchOperationVo.getRetentionState());
+                }
+                welcomeDormitoryService.updateBatchById(dormitories);
+            } else {
+//                如果是保留则需要判断该寝室下的所有床位是否保留，是的话则需要更改
+                for (WelcomeDormitory dormitory : dormitories) {
+                    LambdaQueryWrapper<WelcomeBed> wrapperWB=new LambdaQueryWrapper<>();
+                    wrapperWB.eq(WelcomeBed::getDormitoryId,dormitory.getId())
+                                    .eq(WelcomeBed::getRetentionState,batchOperationVo.getRetentionState());
+                    Integer count = welcomeBedService.count(wrapperWB);
+                    if (count>=dormitory.getBedNumber()) {
+                        dormitory.setRetentionState(batchOperationVo.getRetentionState());
+                    }
+                }
+                welcomeDormitoryService.updateBatchById(dormitories);
+
+            }
+        }
+
         return CommonResult.ok();
     }
 

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

@@ -806,6 +806,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                 List<WelcomeBed> welcomeBeds = welcomeBedService.list(wrapperBed);
                 if (ObjectUtils.isNotEmpty(welcomeBeds)) {
                     for (WelcomeBed welcomeBed : welcomeBeds) {
+                        if (welcomeBed.getIsCheck()==1) {
+                            return CommonResult.fail(welcomeBed.getDormitory()+"中的"+welcomeBed.getNumber()+"号床位已入住,不能更新其状态");
+                        }
                         welcomeBed.setRetentionState(batchOperationVo.getRetentionState());
                     }
                     welcomeBedService.updateBatchById(welcomeBeds);

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

@@ -483,7 +483,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageStudents(String userId, int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus, Integer isRegistered) {
+    public CommonResult queryPageStudents(String userId, int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus, Integer isRegistered,Integer isPay) {
         IPage<StudentPageVo> pages = new Page<>();
         PageUtils<StudentPageVo> result = new PageUtils<>(pages);
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -501,7 +501,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
-        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered);
+        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name, fillStatus, isRegistered,isPay);
         return CommonResult.ok(result);
     }
 
@@ -1524,7 +1524,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public void welcomeStudentExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus) {
+    public void welcomeStudentExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name, String fillStatus,Integer isRegistered,Integer isPay) {
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("学生信息");
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -1543,7 +1543,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
         }
 
-        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus);
+        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name, fillStatus,isRegistered,isPay);
         //导出
 
         Row headerRow = sheet.createRow(0);

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

@@ -19,9 +19,9 @@ import java.util.List;
  */
 @Repository
 public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
-    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeIds") List<String> collegeIds,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name,@Param("fillStatus") String fillStatus,@Param("isRegistered") Integer isRegistered);
+    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeIds") List<String> collegeIds,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name,@Param("fillStatus") String fillStatus,@Param("isRegistered") Integer isRegistered,@Param("isPay") Integer isPay);
 
-    List<StudentPageVo> queryStudentPageList(@Param("collegeIds") List<String> collegeIds, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name,@Param("fillStatus") String fillStatus);
+    List<StudentPageVo> queryStudentPageList(@Param("collegeIds") List<String> collegeIds, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name,@Param("fillStatus") String fillStatus,@Param("isRegistered") Integer isRegistered,@Param("isPay") Integer isPay);
 
     List<StudentRegisterVo> studentRegister();
 

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

@@ -21,4 +21,10 @@ public class WelcomeVisitorQuery extends PageQuery {
 
     @ApiModelProperty(value = "校区名称")
     private String school;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 }

src/main/java/com/template/model/request/InfoCollectionRequest.java

@@ -144,11 +144,11 @@ public class InfoCollectionRequest {
     private String city;
 
     @ApiModelProperty(value = "区ID")
-    @NotNull(message = "区ID不能为空")
+//    @NotNull(message = "区ID不能为空")
     private Integer districtId;
 
     @ApiModelProperty(value = "区")
-    @NotBlank(message = "区不能为空")
+//    @NotBlank(message = "区不能为空")
     private String district;
 
     @ApiModelProperty(value = "家庭住址")

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

@@ -10,6 +10,6 @@ public class BatchOperationBedVo {
     @ApiModelProperty(value = "宿舍id")
     private List<Integer> bedIds;
 
-    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    @ApiModelProperty(value = "保留状态 1:开放，2保留")
     private Integer retentionState;
 }

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);
+    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
 
     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);
+    List<StudentPageVo> queryStudentList(List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay);
 
     WelcomeStudent queryStudentInfo(Integer collegeId, Integer majorId, Integer classstrId,String admissNum);
 

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

@@ -80,18 +80,18 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered) {
+    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay) {
         Page<StudentPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered);
+        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay);
         return new PageUtils(result);
     }
 
     @Override
-    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus) {
+    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus,Integer isRegistered,Integer isPay) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus,isRegistered,isPay);
         return result;
     }
 

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

@@ -246,6 +246,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         wrapper.like(StrUtil.isNotBlank(visitorQuery.getCarNumber()), WelcomeVisitor::getCarNumber, visitorQuery.getCarNumber());
         wrapper.like(StrUtil.isNotBlank(visitorQuery.getName()), WelcomeVisitor::getName, visitorQuery.getName());
         wrapper.eq(StrUtil.isNotBlank(visitorQuery.getSchool()), WelcomeVisitor::getSchool, visitorQuery.getSchool());
+        wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime())&&StrUtil.isNotBlank(visitorQuery.getEndTime()),WelcomeVisitor::getStartTime,visitorQuery.getStartTime(),visitorQuery.getEndTime());
 
         IPage<WelcomeVisitor> page = baseMapper.selectPage(new IPageUtil<WelcomeVisitor>().getPage(visitorQuery), wrapper);
 
@@ -258,6 +259,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         LambdaQueryWrapper<WelcomeVisitor> wrapper = new LambdaQueryWrapper<>();
         wrapper.orderByDesc(WelcomeVisitor::getId);
         wrapper.eq(StrUtil.isNotBlank(visitorQuery.getSchool()), WelcomeVisitor::getSchool, visitorQuery.getSchool());
+        wrapper.between(StrUtil.isNotBlank(visitorQuery.getStartTime())&&StrUtil.isNotBlank(visitorQuery.getEndTime()),WelcomeVisitor::getStartTime,visitorQuery.getStartTime(),visitorQuery.getEndTime());
         List<WelcomeVisitor> welcomeVisitors = list(wrapper);
 
         List<WelcomeVisitorVO> welcomeVisitorVOS = BeanUtil.copyListProperties(welcomeVisitors, WelcomeVisitorVO::new);

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

@@ -177,7 +177,7 @@
             and wb.sex = #{sex}
         </if>
 
-        <if test="isCheck != null and isCheck != ''">
+        <if test="isCheck != null">
             and wb.is_check = #{isCheck}
         </if>
 
@@ -219,7 +219,7 @@
             and wb.sex = #{sex}
         </if>
 
-        <if test="isCheck != null and isCheck != ''">
+        <if test="isCheck != null ">
             and wb.is_check = #{isCheck}
         </if>
 

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

@@ -56,7 +56,9 @@
                 and (ws.is_registered =2 or ws.is_registered is NULL)
             </if>
         </if>
-
+        <if test="isPay != null">
+            and ws.is_pay = #{isPay}
+        </if>
         and ws.iden_type != 2
         order by ws.update_time desc
     </select>