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

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

@@ -28,5 +28,11 @@ public interface WelcomeAccountControllerAPI {
 
     @GetMapping(value = "/listAccount")
     @ApiOperation(value = "查询账号", notes = "查询账号", httpMethod = "GET")
-    CommonResult listAccount(@RequestParam int currentPage, @RequestParam int pageCount);
+    CommonResult listAccount(@RequestParam int currentPage, @RequestParam int pageCount,Integer status,String keyWord,String startTime,String endTime);
+
+
+    @GetMapping(value = "/getAccountAuthority")
+    @ApiOperation(value = "查询账号权限", notes = "查询账号权限", httpMethod = "GET")
+    CommonResult getAccountAuthority(@RequestParam Integer accountId);
+
 }

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

@@ -6,6 +6,9 @@ import com.template.model.request.InfoCollectionRequest;
 import com.template.model.request.InsertWelcomeBedRequest;
 import com.template.model.request.UpdateWelcomeBedRequest;
 import com.template.model.result.CommonResult;
+import com.template.model.vo.BatchOperationBedVo;
+import com.template.model.vo.BatchOperationVo;
+import com.template.model.vo.CheckInVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -65,4 +68,12 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "判断是否入住", notes = "判断是否入住", httpMethod = "GET")
     CommonResult isCheck(@RequestAttribute String studentCard);
 
+    @PostMapping(value = "/batchOperationBed")
+    @ApiOperation(value = "批量操作是否保留", notes = "批量操作是否保留", httpMethod = "POST")
+    CommonResult batchOperationBed(@RequestBody BatchOperationBedVo batchOperationVo);
+
+    @PostMapping(value = "/checkIn")
+    @ApiOperation(value = "入住", notes = "入住", httpMethod = "POST")
+    CommonResult checkIn(@RequestBody CheckInVo checkInVo);
+
 }

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

@@ -26,5 +26,10 @@ public interface WelcomeRoleControllerAPI {
 
     @GetMapping(value = "/listRole")
     @ApiOperation(value = "查询角色", notes = "查询角色", httpMethod = "GET")
-    CommonResult listRole(@RequestParam int currentPage, @RequestParam int pageCount);
+    CommonResult listRole(@RequestParam int currentPage, @RequestParam int pageCount,String keyWord,String startTime,String endTime);
+
+    @GetMapping(value = "/roleGroup")
+    @ApiOperation(value = "角色分组", notes = "角色分组", httpMethod = "GET")
+    CommonResult roleGroup();
+
 }

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

@@ -99,6 +99,10 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("账号不存在");
         }
 
+        if (result.getStatus()!=1) {
+            return CommonResult.fail("账号已冻结");
+        }
+
         String encPassword = AesUtils.encrypt(loginRequest.getPassword());
         if (!encPassword.equals(result.getPassword())) {
             return CommonResult.fail("密码错误");
@@ -111,6 +115,7 @@ public class LoginController implements LoginControllerAPI {
         login.setToken(token);
         login.setTokenTtl(TimeExchange.DateToString(expireTime, "yyyy-MM-dd HH:mm:ss"));
         login.setUserName(result.getName());
+        login.setAccountId(result.getId());
 
         return CommonResult.ok("200", "登录成功", login);
     }

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

@@ -11,6 +11,7 @@ import com.template.model.pojo.WelcomeRole;
 import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.AccountAuthorityVo;
 import com.template.model.vo.WelcomeAccountVo;
 import com.template.services.WelcomeAccountService;
 import com.template.services.WelcomeOrgService;
@@ -87,8 +88,8 @@ public class WelcomeAccountController implements WelcomeAccountControllerAPI {
     }
 
     @Override
-    public CommonResult listAccount(int currentPage, int pageCount) {
-        PageUtils<WelcomeAccountVo> pageUtils= welcomeAccountService.listAccount(currentPage,pageCount);
+    public CommonResult listAccount(int currentPage, int pageCount,Integer status,String keyWord,String startTime,String endTime) {
+        PageUtils<WelcomeAccountVo> pageUtils= welcomeAccountService.listAccount(currentPage,pageCount,status,keyWord,startTime,endTime);
         List<WelcomeAccountVo> list = pageUtils.getList();
         for (WelcomeAccountVo record : list) {
             String collegeId = record.getCollegeId();
@@ -111,5 +112,44 @@ public class WelcomeAccountController implements WelcomeAccountControllerAPI {
         }
         return CommonResult.ok(pageUtils);
     }
+
+    @Override
+    public CommonResult getAccountAuthority(Integer accountId) {
+
+        WelcomeAccount welcomeAccount = welcomeAccountService.getById(accountId);
+        if (ObjectUtils.isEmpty(welcomeAccount)) {
+            return CommonResult.fail("无该账号");
+        }
+
+        Integer roleId = welcomeAccount.getRoleId();
+        if (ObjectUtils.isEmpty(roleId)) {
+            return CommonResult.fail("无角色权限");
+        }
+
+        String collegeId = welcomeAccount.getCollegeId();
+        if (ObjectUtils.isEmpty(collegeId)) {
+            return CommonResult.fail("无管理部门");
+        }
+
+        WelcomeRole welcomeRole = welcomeRoleService.getById(roleId);
+        if (ObjectUtils.isEmpty(welcomeRole)) {
+            return CommonResult.fail("无该角色");
+        }
+
+        List<String> checkOrg= Arrays.asList(collegeId.split(","));
+        List<WelcomeOrg> checkOrgList= new ArrayList<>();
+        for(int i=0;i<checkOrg.size();i++){
+            WelcomeOrg welcomeOrg= welcomeOrgService.getById(checkOrg.get(i));
+            if (welcomeOrg!=null){
+                checkOrgList.add(welcomeOrg);
+            }
+        }
+
+        AccountAuthorityVo vo = new AccountAuthorityVo();
+        vo.setWelcomeRole(welcomeRole);
+        vo.setWelcomeOrgList(checkOrgList);
+
+        return CommonResult.ok(vo);
+    }
 }
 

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

@@ -14,10 +14,7 @@ import com.template.model.request.InsertWelcomeBedRequest;
 import com.template.model.request.UpdateWelcomeBedRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.BedDetailsVo;
-import com.template.model.vo.ListVo;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.WelcomeBedCheckVo;
+import com.template.model.vo.*;
 import com.template.services.*;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -585,10 +582,12 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         headerRow.createCell(6).setCellValue("所属学院");
         headerRow.createCell(7).setCellValue("所属专业");
         headerRow.createCell(8).setCellValue("所属班级");
-        headerRow.createCell(9).setCellValue("是否入住");
-        headerRow.createCell(10).setCellValue("录取号");
-        headerRow.createCell(11).setCellValue("姓名");
-        headerRow.createCell(12).setCellValue("备注");
+        headerRow.createCell(9).setCellValue("辅导员");
+        headerRow.createCell(10).setCellValue("是否入住");
+        headerRow.createCell(11).setCellValue("录取号");
+        headerRow.createCell(12).setCellValue("姓名");
+        headerRow.createCell(13).setCellValue("备注");
+        headerRow.createCell(14).setCellValue("是否保留");
         for (int i = 0; i < result.size(); i++) {
             WelcomeBed bed = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
@@ -601,10 +600,13 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             dataRow.createCell(6).setCellValue(bed.getCollege());
             dataRow.createCell(7).setCellValue(bed.getMajor());
             dataRow.createCell(8).setCellValue(bed.getClassstr());
-            dataRow.createCell(9).setCellValue(bed.getIsCheck());
-            dataRow.createCell(10).setCellValue(bed.getCardNum());
-            dataRow.createCell(11).setCellValue(bed.getName());
-            dataRow.createCell(12).setCellValue(bed.getRemark());
+            dataRow.createCell(9).setCellValue(bed.getInstructor());
+            dataRow.createCell(10).setCellValue(bed.getIsCheck());
+            dataRow.createCell(11).setCellValue(bed.getCardNum());
+            dataRow.createCell(12).setCellValue(bed.getName());
+            dataRow.createCell(13).setCellValue(bed.getRemark());
+            dataRow.createCell(14).setCellValue(bed.getRetentionState());
+
         }
         // 将工作簿写入文件
         ExcelUtils.excelDownload(workbook, "床位信息.xlsx", response);
@@ -684,5 +686,59 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         }
         return CommonResult.ok(vo);
     }
+
+    @Override
+    public CommonResult batchOperationBed(BatchOperationBedVo batchOperationVo) {
+        List<Integer> bedIds = batchOperationVo.getBedIds();
+        LambdaQueryWrapper<WelcomeBed> wrapper=new LambdaQueryWrapper<>();
+        wrapper.in(WelcomeBed::getId,bedIds);
+        List<WelcomeBed> list = welcomeBedService.list(wrapper);
+        if (ObjectUtils.isNotEmpty(list)) {
+            for (WelcomeBed welcomeBed : list) {
+                welcomeBed.setRetentionState(batchOperationVo.getRetentionState());
+            }
+            welcomeBedService.updateBatchById(list);
+        }
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult checkIn(CheckInVo checkInVo) {
+        List<WelcomeStudent> list=welcomeStudentService.getStudent(checkInVo);
+        if (ObjectUtils.isEmpty(list)) {
+            return CommonResult.fail("暂无该学生");
+        }else if (list.size()>1){
+            return CommonResult.fail("该录取号有多个学生,请检查修改后在试");
+        }
+        WelcomeStudent welcomeStudent = list.get(0);
+        WelcomeBed bed = welcomeBedService.getBedById(checkInVo.getBedId());
+        if (ObjectUtils.isEmpty(bed)) {
+            return CommonResult.fail("不存在该床铺");
+        }
+        bed.setIsCheck(1);
+        bed.setStudentCard(welcomeStudent.getCardId());
+        bed.setCardNum(welcomeStudent.getAdmissNum());
+        bed.setClassstrId(welcomeStudent.getClassstrId());
+        bed.setClassstr(welcomeStudent.getClassstr());
+        bed.setName(welcomeStudent.getName());
+        welcomeBedService.updateWelcomeBed(bed);
+
+//        修改寝室信息
+        WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
+        if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
+            Integer freeBedNumber = welcomeDormitory.getFreeBedNumber();
+            freeBedNumber=freeBedNumber-1;
+            if (freeBedNumber>0) {
+                welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                welcomeDormitory.setStatus(3);
+            }else if (freeBedNumber==0){
+                welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                welcomeDormitory.setStatus(1);
+            }
+            welcomeDormitoryService.updateById(welcomeDormitory);
+        }
+
+        return CommonResult.ok();
+    }
 }
 

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

@@ -611,6 +611,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         headerRow.createCell(8).setCellValue("空闲床位数");
         headerRow.createCell(9).setCellValue("入住情况");
         headerRow.createCell(10).setCellValue("备注");
+        headerRow.createCell(11).setCellValue("是否保留");
         for (int i = 0; i < result.size(); i++) {
             WelcomeDormitoryVo build = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
@@ -625,6 +626,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             dataRow.createCell(8).setCellValue(build.getFreeBedNumber());
             dataRow.createCell(9).setCellValue(build.getStatus());
             dataRow.createCell(10).setCellValue(build.getRemark());
+            dataRow.createCell(11).setCellValue(build.getRetentionState());
         }
         // 将工作簿写入文件
         ExcelUtils.excelDownload(workbook, "寝室信息.xlsx", response);

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

@@ -80,9 +80,15 @@ public class WelcomeRoleController implements WelcomeRoleControllerAPI {
     }
 
     @Override
-    public CommonResult listRole(int currentPage, int pageCount) {
-        PageUtils<WelcomeRole> pageUtils= welcomeRoleService.listRole(currentPage,pageCount);
+    public CommonResult listRole(int currentPage, int pageCount,String keyWord,String startTime ,String endTime) {
+        PageUtils<WelcomeRole> pageUtils= welcomeRoleService.listRole(currentPage,pageCount,keyWord,startTime,endTime);
         return CommonResult.ok(pageUtils);
     }
+
+    @Override
+    public CommonResult roleGroup() {
+        List<WelcomeRole> welcomeRoles=welcomeRoleService.roleGroup();
+        return CommonResult.ok(welcomeRoles);
+    }
 }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.WelcomeAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.template.model.vo.WelcomeAccountVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -18,5 +19,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WelcomeAccountMapper extends BaseMapper<WelcomeAccount> {
 
-    IPage<WelcomeAccountVo> listAccount(Page<WelcomeAccountVo> page);
+    IPage<WelcomeAccountVo> listAccount(Page<WelcomeAccountVo> page, @Param("status") Integer status,@Param("keyWord") String keyWord,@Param("startTime") String startTime,@Param("endTime") String endTime);
 }

src/main/java/com/template/model/pojo/WelcomeAccount.java

@@ -34,7 +34,7 @@ public class WelcomeAccount implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "名称")
+    @ApiModelProperty(value = "真实名称")
     private String name;
 
     @ApiModelProperty(value = "账号")
@@ -49,6 +49,12 @@ public class WelcomeAccount implements Serializable {
     @ApiModelProperty(value = "学院id")
     private String collegeId;
 
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "状态 0：冻结 ，1正常")
+    private Integer status;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/model/pojo/WelcomeBed.java

@@ -94,6 +94,9 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "辅导员")
+    private String instructor;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/model/pojo/WelcomeRole.java

@@ -37,31 +37,37 @@ public class WelcomeRole implements Serializable {
     @ApiModelProperty(value = "角色名称")
     private String roleName;
 
-    @ApiModelProperty(value = "数据总览设置 1.数据总览")
+    @ApiModelProperty(value = "数据总览设置 0.全部，1查看页面")
     private String dataManagementSetting;
 
-    @ApiModelProperty(value = "学生管理设置 1.添加，2查询，3编辑，4删除，5.导入，6导出")
+    @ApiModelProperty(value = "学生信息管理设置 0.全部， 1.添加，2查询，3编辑，4删除，5.导入，6导出，7详情")
     private String studentManagementSetting;
 
-    @ApiModelProperty(value = "楼栋管理设置 1.添加，2查询，3编辑，4删除，5.导入，6导出")
+    @ApiModelProperty(value = "楼栋管理设置 0.全部， 1.添加，2查询，3编辑，4删除，5.导入，6导出")
     private String buildingManagementSetting;
 
-    @ApiModelProperty(value = "宿舍管理设置 1.添加，2查询，3编辑，4删除，5导出")
+    @ApiModelProperty(value = "宿舍管理设置 0.全部， 1.添加，2查询，3编辑，4删除，5导出，6导出，7批量保留，8批量开放，9保留，10开发")
     private String dormitoryManagementSetting;
 
-    @ApiModelProperty(value = "床位管理设置 1.添加，2查询，3编辑，4删除，5导出")
+    @ApiModelProperty(value = "床位管理设置 0.全部， 1.添加，2查询，3编辑所属专业，4删除，5.导入，6导出，7批量保留，8批量开放，9保留，10开发，11.入住，12退宿，13，换床，14.床位对调，15.所属班级，16.辅导员")
     private String bedManagementSetting;
 
-    @ApiModelProperty(value = "访客管理设置 1.添加，2查询，3编辑，4删除，5导出")
+    @ApiModelProperty(value = "学生住宿设置 0.全部， 1.查看界面，2.导出")
+    private String studentAccommodationSetting;
+
+    @ApiModelProperty(value = "住宿统计设置 0.全部， 1.查看界面，2.导出")
+    private String accommodationStatisticsSetting;
+
+    @ApiModelProperty(value = "访客管理设置 0.全部， 1.添加，2查询，3编辑，4删除，5导出")
     private String visitorManagementSetting;
 
-    @ApiModelProperty(value = "角色管理设置 1.添加，2查询，3编辑，4删除")
+    @ApiModelProperty(value = "角色管理设置 0.全部， 1.添加，2查询，3编辑，4删除，")
     private String roleManagementSetting;
 
-    @ApiModelProperty(value = "账号管理设置 1.添加，2查询，3编辑，4删除")
+    @ApiModelProperty(value = "账号管理设置  0.全部，1.添加，2查询，3编辑，4删除，")
     private String accountManagementSetting;
 
-    @ApiModelProperty(value = "设置管理设置 1.缴费设置，2.车位数设置，3.联系方式设置，4.文本设置")
+    @ApiModelProperty(value = "设置管理设置 0.全部， 1.缴费设置，2.车位数设置，3.联系方式设置，4.文本设置")
     private String settingManagementSetting;
 
     @ApiModelProperty(value = "创建时间")

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

@@ -0,0 +1,18 @@
+package com.template.model.vo;
+
+import com.template.model.pojo.WelcomeOrg;
+import com.template.model.pojo.WelcomeRole;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.management.relation.Role;
+import java.util.List;
+
+@Data
+public class AccountAuthorityVo {
+    @ApiModelProperty(value = "角色数据")
+    private WelcomeRole welcomeRole;
+
+    @ApiModelProperty(value = "学院数据")
+    private List<WelcomeOrg> welcomeOrgList;
+}

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

@@ -0,0 +1,15 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BatchOperationBedVo {
+    @ApiModelProperty(value = "宿舍id")
+    private List<Integer> bedIds;
+
+    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    private Integer retentionState;
+}

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

@@ -0,0 +1,14 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class CheckInVo {
+//    名字
+    private String name;
+//      录取号
+    private String admissNum;
+
+    private Integer bedId;
+
+}

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

@@ -27,4 +27,9 @@ public class LoginVO {
      */
     private String tokenTtl;
 
+    /**
+     * 权限id
+     */
+    private Integer accountId;
+
 }

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

@@ -34,4 +34,10 @@ public class WelcomeAccountVo {
 
     @ApiModelProperty(value = "学院名称")
     private List<WelcomeOrg> welcomeOrgList;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "状态 0：冻结 ，1正常")
+    private Integer status;
 }

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

@@ -28,6 +28,6 @@ public interface WelcomeAccountService extends IService<WelcomeAccount> {
     WelcomeAccount getDataByAccount(String account);
 
 
-    PageUtils<WelcomeAccountVo> listAccount(int currentPage, int pageCount);
+    PageUtils<WelcomeAccountVo> listAccount(int currentPage, int pageCount,Integer status,String keyWord,String startTime,String endTime);
 
 }

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

@@ -4,6 +4,8 @@ import com.template.model.pojo.WelcomeRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,5 +16,7 @@ import com.template.model.result.PageUtils;
  */
 public interface WelcomeRoleService extends IService<WelcomeRole> {
 
-    PageUtils<WelcomeRole> listRole(int currentPage, int pageCount);
+    PageUtils<WelcomeRole> listRole(int currentPage, int pageCount,String keyWord,String startTime ,String endTime);
+
+    List<WelcomeRole> roleGroup();
 }

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

@@ -5,10 +5,7 @@ import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeStudent;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.StudentRegisterVo;
-import com.template.model.vo.StudentSexRatioVo;
-import com.template.model.vo.StudentTrafficVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -58,4 +55,5 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     int payCount();
 
+    List<WelcomeStudent> getStudent(CheckInVo checkInVo);
 }

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

@@ -79,9 +79,9 @@ public class WelcomeAccountServiceImpl extends ServiceImpl<WelcomeAccountMapper,
     }
 
     @Override
-    public PageUtils<WelcomeAccountVo> listAccount(int currentPage, int pageCount) {
+    public PageUtils<WelcomeAccountVo> listAccount(int currentPage, int pageCount,Integer status,String keyWord,String startTime,String endTime) {
         Page<WelcomeAccountVo> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeAccountVo> result = welcomeAccountMapper.listAccount(page);
+        IPage<WelcomeAccountVo> result = welcomeAccountMapper.listAccount(page,status,keyWord,startTime,endTime);
         return new PageUtils<>(result);
     }
 

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

@@ -1,7 +1,10 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.WelcomeRole;
 import com.template.mapper.WelcomeRoleMapper;
@@ -12,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -27,8 +32,19 @@ public class WelcomeRoleServiceImpl extends ServiceImpl<WelcomeRoleMapper, Welco
     WelcomeRoleMapper welcomeRoleMapper;
 
     @Override
-    public PageUtils<WelcomeRole> listRole(int currentPage, int pageCount) {
-        IPage<WelcomeRole> result = welcomeRoleMapper.selectPage(new Page<>(currentPage, pageCount), new QueryWrapper<>());
+    public PageUtils<WelcomeRole> listRole(int currentPage, int pageCount,String keyWord,String startTime ,String endTime) {
+        LambdaQueryWrapper<WelcomeRole> wrapper=new LambdaQueryWrapper<>();
+        wrapper.like(ObjectUtils.isNotEmpty(keyWord),WelcomeRole::getRoleName,keyWord)
+                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),WelcomeRole::getCreateTime,startTime,endTime);
+        IPage<WelcomeRole> result = welcomeRoleMapper.selectPage(new Page<>(currentPage, pageCount), wrapper);
         return new PageUtils<>(result);
     }
+
+    @Override
+    public List<WelcomeRole> roleGroup() {
+        LambdaQueryWrapper<WelcomeRole> wrapper=new LambdaQueryWrapper<>();
+        wrapper.select(WelcomeRole::getId,WelcomeRole::getRoleName);
+        List<WelcomeRole> welcomeRoles = welcomeRoleMapper.selectList(wrapper);
+        return welcomeRoles;
+    }
 }

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

@@ -11,10 +11,7 @@ import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeStudent;
 import com.template.mapper.WelcomeStudentMapper;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.StudentRegisterVo;
-import com.template.model.vo.StudentSexRatioVo;
-import com.template.model.vo.StudentTrafficVo;
+import com.template.model.vo.*;
 import com.template.services.WelcomeStudentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -157,6 +154,16 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
+    public List<WelcomeStudent> getStudent(CheckInVo checkInVo) {
+        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getName,checkInVo.getName())
+                        .eq(WelcomeStudent::getAdmissNum,checkInVo.getAdmissNum())
+                .eq(WelcomeStudent::getIdenType,1);
+        List<WelcomeStudent> list = welcomeStudentMapper.selectList(wrapper);
+        return list;
+    }
+
+    @Override
     public WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(e -> e.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum)

src/main/resources/application-dev.yml

@@ -16,7 +16,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai2024.
-    url: jdbc:mysql://172.16.40.122:3306/welcome?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    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
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application-prod.yml

@@ -16,7 +16,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai2024.
-    url: jdbc:mysql://172.16.40.122:3306/welcome?characterEncoding=UTF-8&useSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.40.126:3306/welcome?characterEncoding=UTF-8&useSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application.yml

@@ -18,7 +18,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai2024.
-    url: jdbc:mysql://172.16.40.122:3306/welcome?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    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
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

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

@@ -12,6 +12,15 @@
                 AND wr.deleted = 0
         WHERE
             wa.deleted = 0
+        <if test="status != null and status != ''">
+            and wa.status= #{status}
+        </if>
+        <if test="keyWord != null and keyWord != ''">
+            and wa.name like '%' #{keyWord} '%'
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != '' ">
+            and wa.create_time >= #{startTime} and #{endTime} >= wa.create_time
+        </if>
         ORDER BY
             wa.create_time
     </select>