Merge remote-tracking branch 'origin/master'

src/main/java/com/template/AutoCode.java

@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("welcome_org","welcome_visitor","welcome_city"); // 设置要映射的表名
+        strategy.setInclude("welcome_dormitory"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

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

@@ -0,0 +1,20 @@
+package com.template.api;
+
+import com.template.model.request.InfoCollectionRequest;
+import com.template.model.request.InsertStudentRequest;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("/api/welcomeArriveSetting")
+@Api(tags = {"WelcomeArriveSettingController"}, value = "到达时间段管理")
+public interface WelcomeArriveSettingControllerAPI {
+
+    @GetMapping(value = "/queryArriveTimes")
+    @ApiOperation(value = "到达时间段数据", notes = "到达时间段数据", httpMethod = "GET")
+    CommonResult queryArriveTimes();
+
+}

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

@@ -0,0 +1,32 @@
+package com.template.api;
+
+import com.template.model.pojo.WelcomeStudentDormitory;
+import com.template.model.request.InsertStudentRequest;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/api/welcome-dormitory")
+public interface WelcomeDormitoryControllerAPI {
+
+    @GetMapping(value = "/groupBuild")
+    @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")
+    CommonResult groupBuild(String sex,String college,String gradestr,String school);
+
+
+    @GetMapping(value = "/groupDormitory")
+    @ApiOperation(value = "寝室分组", notes = "寝室分组", httpMethod = "GET")
+    CommonResult groupDormitory(String sex,String college,String gradestr,String school,String buildName);
+
+
+    @GetMapping(value = "/groupBedNumber")
+    @ApiOperation(value = "床位分组", notes = "床位分组", httpMethod = "GET")
+    CommonResult groupBedNumber(String sex,String college,String gradestr,String school,String buildName,String dormitoryName);
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.template.api;
+
+import com.template.model.request.InfoCollectionRequest;
+import com.template.model.request.InsertStudentRequest;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+@RequestMapping("/api/welcomeFile")
+@Api(tags = {"WelcomeFileController"}, value = "文件管理")
+public interface WelcomeFileControllerAPI {
+
+    @PostMapping(value = "/uploadFile")
+    @ApiOperation(value = "文件上传", notes = "文件上传", httpMethod = "POST")
+    CommonResult uploadFile(@RequestParam("file") MultipartFile file) throws Exception;
+
+}

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

@@ -0,0 +1,28 @@
+package com.template.api;
+
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+@RequestMapping("/api/welcomeOrg")
+@Api(tags = {"WelcomeOrgController"}, value = "下拉数据管理")
+public interface WelcomeOrgControllerAPI {
+
+    @GetMapping(value = "/getColleges")
+    @ApiOperation(value = "获取学院下拉数据", notes = "获取学院下拉数据", httpMethod = "GET")
+    CommonResult getColleges();
+
+    @GetMapping(value = "/getMajors")
+    @ApiOperation(value = "获取专业下拉数据", notes = "获取专业下拉数据", httpMethod = "GET")
+    CommonResult getMajors(@RequestParam int collegeId);
+
+    @GetMapping(value = "/getClasss")
+    @ApiOperation(value = "获取班级下拉数据", notes = "获取班级下拉数据", httpMethod = "GET")
+    CommonResult getClasss(@RequestParam int majorId);
+
+}

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

@@ -1,5 +1,6 @@
 package com.template.api;
 
+import com.template.model.request.InfoCollectionRequest;
 import com.template.model.request.InsertStudentRequest;
 import com.template.model.request.RegisterRequest;
 import com.template.model.result.CommonResult;
@@ -7,20 +8,29 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/api/welcomeStudent")
 @Api(tags = {"WelcomeStudentController"}, value = "学生信息管理")
 public interface WelcomeStudentControllerAPI {
 
-    @GetMapping(value = "/insertStudentInfo")
+    @PostMapping(value = "/insertStudentInfo")
     @ApiOperation(value = "添加学生信息", notes = "添加学生信息", httpMethod = "POST")
     CommonResult insertStudentInfo(@Validated @RequestBody InsertStudentRequest isr, BindingResult bindingResult) throws Exception;
 
     @GetMapping(value = "/queryPageStudents")
     @ApiOperation(value = "学生信息分页数据", notes = "学生信息分页数据", httpMethod = "GET")
-    CommonResult queryPageStudents(@RequestParam int currentPage, @RequestParam int pageCount, String college, String major, String classstr, String trafficMethod, String name);
+    CommonResult queryPageStudents(@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+
+    @GetMapping(value = "/queryStudentDetail")
+    @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
+    CommonResult queryStudentDetail(@RequestParam int id);
+
+    @PostMapping(value = "/infoCollection")
+    @ApiOperation(value = "学生信息采集", notes = "学生信息采集", httpMethod = "POST")
+    CommonResult infoCollection(@Validated @RequestBody InfoCollectionRequest icr, BindingResult bindingResult) throws Exception;
+
+    @GetMapping(value = "/deleteStudentInfo")
+    @ApiOperation(value = "删除学生信息", notes = "删除学生信息", httpMethod = "GET")
+    CommonResult deleteStudentInfo(@RequestParam int id) throws Exception;
 }

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

@@ -0,0 +1,23 @@
+package com.template.api;
+
+import com.template.model.pojo.WelcomeStudentDormitory;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/api/welcome-student-dormitory")
+public interface WelcomeStudentDormitoryControllerAPI {
+
+    @PostMapping(value = "/submit")
+    @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
+    CommonResult submit(@RequestBody WelcomeStudentDormitory welcomeStudentDormitory);
+
+
+    @GetMapping(value = "/dormitoryDetails")
+    @ApiOperation(value = "宿舍详情", notes = "宿舍详情", httpMethod = "GET")
+    CommonResult dormitoryDetails(String buildName,String dormitoryName,String studentCard);
+
+}

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-accompany")
 public class WelcomeAccompanyController {
 
 }

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-account")
 public class WelcomeAccountController {
 
 }

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

@@ -1,21 +1,52 @@
 package com.template.controller;
 
 
+import com.template.api.WelcomeArriveSettingControllerAPI;
+import com.template.model.pojo.WelcomeArriveSetting;
+import com.template.model.result.CommonResult;
+import com.template.model.vo.ArriveTimeVo;
+import com.template.services.WelcomeArriveSettingService;
+import com.template.services.WelcomeStudentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-arrive-setting")
-public class WelcomeArriveSettingController {
+public class WelcomeArriveSettingController implements WelcomeArriveSettingControllerAPI {
+    @Autowired
+    private WelcomeArriveSettingService welcomeArriveSettingService;
+
+    @Override
+    public CommonResult queryArriveTimes() {
+        //时间段
+        List<ArriveTimeVo> result = new ArrayList<>();
+        List<WelcomeArriveSetting> wass = welcomeArriveSettingService.queryCheckDatas();
+        if (wass != null && wass.size() > 0) {
+            for (WelcomeArriveSetting was : wass) {
+                ArriveTimeVo atv = new ArriveTimeVo();
+                atv.setId(was.getId());
+                atv.setStartTime(was.getStartTime());
+                atv.setEndTime(was.getEndTime());
+                atv.setTimeStr(was.getStartTime() + "-" + was.getEndTime());
+                atv.setIsCheck(0);
+                result.add(atv);
+            }
+        }
+        return CommonResult.ok(result);
+    }
+
 
 }
 

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-bed")
 public class WelcomeBedController {
 
 }

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-build")
 public class WelcomeBuildController {
 
 }

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

@@ -1,10 +1,25 @@
 package com.template.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.template.api.WelcomeDormitoryControllerAPI;
+import com.template.api.WelcomeStudentControllerAPI;
+import com.template.model.pojo.WelcomeDormitory;
+import com.template.model.pojo.WelcomeStudent;
+import com.template.model.pojo.WelcomeStudentDormitory;
+import com.template.model.result.CommonResult;
+import com.template.services.WelcomeDormitoryService;
+import com.template.services.WelcomeStudentDormitoryService;
+import com.template.services.WelcomeStudentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +29,62 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-dormitory")
-public class WelcomeDormitoryController {
+public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI {
+
+    @Autowired
+    WelcomeDormitoryService welcomeDormitoryService;
+
+    @Autowired
+    WelcomeStudentDormitoryService welcomeStudentDormitoryService;
+
+    @Override
+    public CommonResult groupBuild(String sex,String college,String gradestr,String school) {
+
+        List<String> list = welcomeDormitoryService.groupBuild(sex,college,gradestr,school);
+
+        return CommonResult.ok(list);
+    }
+
+    @Override
+    public CommonResult groupDormitory(String sex,String college,String gradestr,String school,String buildName) {
+
+        List<String> list = welcomeDormitoryService.groupDormitory(sex,college,gradestr,buildName,school);
+
+        return CommonResult.ok(list);
+    }
+
+    @Override
+    public CommonResult groupBedNumber(String sex,String college,String gradestr,String school,String buildName, String dormitoryName) {
+
+//        查询对应寝室
+        LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeDormitory::getBuild,buildName)
+                .eq(WelcomeDormitory::getDormitory,dormitoryName)
+                .eq(WelcomeDormitory::getSex,sex)
+                .eq(WelcomeDormitory::getCollege,college)
+                .eq(WelcomeDormitory::getGradestr,gradestr)
+                .eq(WelcomeDormitory::getSchool,school);
+        WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getOne(wrapper);
+//        获取床位数
+        Integer bedNumber = welcomeDormitory.getBedNumber();
+
+//        查找哪些已经入住了
+        LambdaQueryWrapper<WelcomeStudentDormitory> wrapperStudentDormitory=new LambdaQueryWrapper<>();
+        wrapperStudentDormitory.eq(WelcomeStudentDormitory::getBuilding,buildName)
+                        .eq(WelcomeStudentDormitory::getDormitory,dormitoryName);
+        List<WelcomeStudentDormitory> list1 = welcomeStudentDormitoryService.list(wrapperStudentDormitory);
+
+        ArrayList<Integer> bedNums = new ArrayList<>();
+        for (int i = 1; i <= bedNumber; i++) {
+            bedNums.add(i);
+        }
+
+        for (WelcomeStudentDormitory welcomeStudentDormitory : list1) {
+            Integer bedNum = Integer.valueOf(welcomeStudentDormitory.getBedNum());
+            bedNums.remove(bedNum);
+        }
 
+        return CommonResult.ok(bedNums);
+    }
 }
 

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-family")
 public class WelcomeFamilyController {
 
 }

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

@@ -0,0 +1,89 @@
+package com.template.controller;
+
+
+import com.jcraft.jsch.*;
+import com.template.api.WelcomeFileControllerAPI;
+import com.template.model.result.CommonResult;
+import com.template.model.vo.UploadFileVo;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2025-06-13
+ */
+@RestController
+public class WelcomeFileController implements WelcomeFileControllerAPI {
+
+    /**
+     * 文件上传
+     *
+     * @param file 上传的文件
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult uploadFile(MultipartFile file) throws Exception {
+
+        UploadFileVo result = new UploadFileVo();
+
+        String name = com.repair.common.utils.StrUtils.getRandomName(file.getOriginalFilename());
+
+        String user = "root"; //SFTP服务器用户名
+        String password = "Waimai2024#"; // SFTP服务器密码
+        String host = "172.16.40.122";  //  SFTP服务器地址
+        int port = 22; // SFTP 服务器端口
+        String remoteDirPath = "/home/image"; // 远程目录路径
+        //从MultipartFile对象中获取流
+        InputStream inputStream = null;
+        inputStream = file.getInputStream();
+        //String downpath="/book/《Python爬虫开发与项目实战》.pdf";
+        //String spath="C:/Users/F1339769/Desktop";
+        JSch jsch = new JSch();
+        Session session = null;
+        ChannelSftp channelSftp = null;
+        try {
+            session = jsch.getSession(user, host, port);
+            session.setPassword(password);
+            session.setConfig("StrictHostKeyChecking", "no");
+            session.connect(30000);
+            System.out.println("连接成功");
+            channelSftp = (ChannelSftp) session.openChannel("sftp");
+            channelSftp.connect();
+            // 创建远程目录
+            String[] dirArr = remoteDirPath.split("/");
+            String path = "";
+            for (int i = 0; i < dirArr.length; i++) {
+                path = path + "/" + dirArr[i];
+                try {
+                    channelSftp.cd(path);
+                } catch (SftpException e) {
+                    channelSftp.mkdir(path);
+                    channelSftp.cd(path);
+                }
+            }
+            //  文件上传到远程服务器上
+            channelSftp.put(inputStream, name);
+            //  从远程服务器上下载文件
+            //channelSftp.get(downpath, spath);
+        } catch (JSchException e) {
+            e.printStackTrace();
+        } finally {
+            if (channelSftp != null) {
+                channelSftp.disconnect();
+            }
+            if (session != null) {
+                session.disconnect();
+            }
+            result.setUrl("https://chtech.ncjti.edu.cn/alumnus/homeimage/" + name);
+        }
+        return CommonResult.ok(result);
+    }
+}
+

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-open-setting")
 public class WelcomeOpenSettingController {
 
 }

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

@@ -1,20 +1,77 @@
 package com.template.controller;
 
 
+import com.template.api.WelcomeOrgControllerAPI;
+import com.template.model.pojo.WelcomeOrg;
+import com.template.model.result.CommonResult;
+import com.template.model.vo.ListVo;
+import com.template.services.WelcomeOrgService;
+import com.template.services.WelcomeStudentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
  * @since 2025-06-16
  */
 @RestController
-public class WelcomeOrgController {
+public class WelcomeOrgController implements WelcomeOrgControllerAPI {
+
+    @Autowired
+    private WelcomeOrgService welcomeOrgService;
+
+    @Override
+    public CommonResult getColleges() {
+        List<WelcomeOrg> colleges = welcomeOrgService.queryColleges();
+
+        List<ListVo> result = new ArrayList<>();
+        for (WelcomeOrg coll:colleges) {
+            ListVo data = new ListVo();
+            data.setId(coll.getId());
+            data.setName(coll.getName());
+            result.add(data);
+        }
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult getMajors(int collegeId) {
+        List<WelcomeOrg> majors = welcomeOrgService.queryMajors(collegeId);
+
+        List<ListVo> result = new ArrayList<>();
+        for (WelcomeOrg maj:majors) {
+            ListVo data = new ListVo();
+            data.setId(maj.getId());
+            data.setName(maj.getName());
+            result.add(data);
+        }
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult getClasss(int majorId) {
+        List<WelcomeOrg> classs = welcomeOrgService.queryClasss(majorId);
+
+        List<ListVo> result = new ArrayList<>();
+        for (WelcomeOrg maj:classs) {
+            ListVo data = new ListVo();
+            data.setId(maj.getId());
+            data.setName(maj.getName());
+            result.add(data);
+        }
+        return CommonResult.ok(result);
+    }
+
+
 
 }
 

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-pay-setting")
 public class WelcomePaySettingController {
 
 }

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

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-setting")
 public class WelcomeSettingController {
 
 }

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

@@ -4,20 +4,15 @@ package com.template.controller;
 import com.alibaba.fastjson.JSON;
 import com.template.api.WelcomeStudentControllerAPI;
 import com.template.common.utils.paramUtils;
-import com.template.model.pojo.WelcomeAccompany;
-import com.template.model.pojo.WelcomeFamily;
-import com.template.model.pojo.WelcomeStudent;
-import com.template.model.pojo.WelcomeStudentDormitory;
+import com.template.model.pojo.*;
+import com.template.model.request.InfoCollectionRequest;
 import com.template.model.request.InsertAccompanyRequest;
 import com.template.model.request.InsertFamilyRequest;
 import com.template.model.request.InsertStudentRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.StudentPageVo;
-import com.template.services.WelcomeAccompanyService;
-import com.template.services.WelcomeFamilyService;
-import com.template.services.WelcomeStudentDormitoryService;
-import com.template.services.WelcomeStudentService;
+import com.template.model.vo.*;
+import com.template.services.*;
 import io.swagger.annotations.ApiModelProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,6 +52,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Autowired
     private WelcomeStudentDormitoryService welcomeStudentDormitoryService;
 
+    @Autowired
+    private WelcomeArriveSettingService welcomeArriveSettingService;
+
     private static Logger logger = LoggerFactory.getLogger(WelcomeStudentController.class);
 
     @Override
@@ -84,6 +82,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         ws.setCollege(isr.getCollege());
         ws.setMajor(isr.getMajor());
         ws.setClassstr(isr.getClassstr());
+        ws.setCollegeId(isr.getCollegeId());
+        ws.setMajorId(isr.getMajorId());
+        ws.setClassstrId(isr.getClassstrId());
         ws.setExamNum(isr.getExamNum());
         ws.setEduSystem(isr.getEduSystem());
         ws.setGraduationSchool(isr.getGraduationSchool());
@@ -170,7 +171,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
 
             int insertStudentDormitory = welcomeStudentDormitoryService.insertWelcomeStudentDormitory(wsd);
-            if(insertStudentDormitory <= 0){
+            if (insertStudentDormitory <= 0) {
                 logger.error("添加宿舍信息失败，参数：" + JSON.toJSON(wsd));
                 throw new Exception("添加失败！");
             }
@@ -183,9 +184,248 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageStudents(int currentPage, int pageCount, String college, String major, String classstr, String trafficMethod, String name) {
-        PageUtils<StudentPageVo> result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, college, major, classstr, trafficMethod, name);
+    public CommonResult queryPageStudents(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+        PageUtils<StudentPageVo> result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeId, majorId, classstrId, trafficMethod, name);
         return CommonResult.ok(result);
     }
+
+    @Override
+    public CommonResult queryStudentDetail(int id) {
+        StudentDetailVo result = new StudentDetailVo();
+
+        WelcomeStudent ws = welcomeStudentService.getManageById(id);
+        if (ws == null) {
+            return CommonResult.ok("学生信息已失效，查看失败！");
+        }
+
+        //家庭成员
+        List<FamilyVo> fvs = new ArrayList<>();
+        List<WelcomeFamily> familys = welcomeFamilyService.getManageByCardId(ws.getCardId());
+        if (familys != null && familys.size() > 0) {
+            for (WelcomeFamily wf : familys) {
+                FamilyVo fv = new FamilyVo();
+                fv.setId(wf.getId());
+                fv.setFamilyShip(wf.getFamilyShip());
+                fv.setName(wf.getName());
+                fv.setPhone(wf.getPhone());
+                fv.setWorkUnit(wf.getWorkUnit());
+                fvs.add(fv);
+            }
+
+        }
+        result.setFvs(fvs);
+
+        //陪同人员
+        List<AccompanyVo> avs = new ArrayList<>();
+        List<WelcomeAccompany> accompanys = welcomeAccompanyService.getManageByCardId(ws.getCardId());
+        if (accompanys != null && accompanys.size() > 0) {
+            for (WelcomeAccompany ac : accompanys) {
+                AccompanyVo av = new AccompanyVo();
+                av.setId(ac.getId());
+                av.setName(ac.getName());
+                av.setPhone(ac.getPhone());
+                avs.add(av);
+            }
+        }
+        result.setAvs(avs);
+
+        //宿舍信息
+        WelcomeStudentDormitory wsd = welcomeStudentDormitoryService.getManageByCardId(ws.getCardId());
+        if (wsd != null) {
+            result.setBuilding(wsd.getBuilding());//楼栋
+            result.setDormitory(wsd.getDormitory());//寝室号
+            result.setBedNum(wsd.getBedNum());//床位号
+        }
+
+        //时间段
+        List<ArriveTimeVo> atvs = new ArrayList<>();
+        List<WelcomeArriveSetting> wass = welcomeArriveSettingService.queryCheckDatas();
+        if (wass != null && wass.size() > 0) {
+            for (WelcomeArriveSetting was : wass) {
+                ArriveTimeVo atv = new ArriveTimeVo();
+                atv.setId(was.getId());
+                atv.setStartTime(was.getStartTime());
+                atv.setEndTime(was.getEndTime());
+                atv.setTimeStr(was.getStartTime() + "-" + was.getEndTime());
+                atv.setIsCheck((ws.getArriveTimeId() != null && was.getId().equals(ws.getArriveTimeId())) ? 1 : 0);
+                atvs.add(atv);
+            }
+        }
+        result.setAtvs(atvs);
+
+        result.setId(ws.getId());
+        result.setAdmissNum(ws.getAdmissNum());
+        result.setName(ws.getName());
+        result.setPicture(ws.getPicture());
+        result.setCardId(ws.getCardId());
+        result.setSex(ws.getSex());
+        result.setBirthday(ws.getBirthday());
+        result.setCollege(ws.getCollege());
+        result.setMajor(ws.getMajor());
+        result.setClassstr(ws.getClassstr());
+        result.setCollegeId(ws.getCollegeId());
+        result.setMajorId(ws.getMajorId());
+        result.setClassstrId(ws.getClassstrId());
+        result.setExamNum(ws.getExamNum());
+        result.setEduSystem(ws.getEduSystem());
+        result.setGraduationSchool(ws.getGraduationSchool());
+        result.setBatchValue(ws.getBatchValue());
+        result.setPoliticalStatu(ws.getPoliticalStatu());
+        result.setNationality(ws.getNationality());
+        result.setPhone(ws.getPhone());
+        result.setOprovinceId(ws.getOprovinceId());
+        result.setOprovince(ws.getOprovince());
+        result.setOcityId(ws.getOcityId());
+        result.setOcity(ws.getOcity());
+        result.setOdistrictId(ws.getOdistrictId());
+        result.setOdistrict(ws.getOdistrict());
+        result.setProvinceId(ws.getProvinceId());
+        result.setProvince(ws.getProvince());
+        result.setCityId(ws.getCityId());
+        result.setCity(ws.getCity());
+        result.setDistrictId(ws.getDistrictId());
+        result.setDistrict(ws.getDistrict());
+        result.setAddress(ws.getAddress());
+        result.setRegisterOntime(ws.getRegisterOntime());
+        result.setZipCode(ws.getZipCode());
+        result.setTrafficMethod(ws.getTrafficMethod());
+        result.setArrive(ws.getArrive());
+        result.setArrvieDate(ws.getArrvieDate());
+        result.setArriveTimeId(ws.getArriveTimeId());
+        result.setAmountPayable(ws.getAmountPayable());
+        result.setPayAmount(ws.getPayAmount());
+        result.setIsDrive(ws.getIsDrive());
+        result.setCarNumber(ws.getCarNumber());
+
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult infoCollection(InfoCollectionRequest icr, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        WelcomeStudent ws = welcomeStudentService.getDataByIdcard(icr.getCardId());
+        if (ws == null) {
+            ws = new WelcomeStudent();
+        }
+        ws.setAdmissNum(icr.getAdmissNum());
+        ws.setName(icr.getName());
+        ws.setPicture(icr.getPicture());
+        ws.setCardId(icr.getCardId());
+        ws.setSex(icr.getSex());
+        ws.setBirthday(icr.getBirthday());
+        ws.setCollegeId(icr.getCollegeId());
+        ws.setMajorId(icr.getMajorId());
+        ws.setClassstrId(icr.getClassstrId());
+        ws.setExamNum(icr.getExamNum());
+        ws.setEduSystem(icr.getEduSystem());
+        ws.setGraduationSchool(icr.getGraduationSchool());
+        ws.setBatchValue(icr.getBatchValue());
+        ws.setPoliticalStatu(icr.getPoliticalStatu());
+        ws.setNationality(icr.getNationality());
+        ws.setPhone(icr.getPhone());
+        ws.setOprovinceId(icr.getOprovinceId());
+        ws.setOprovince(icr.getOprovince());
+        ws.setOcityId(icr.getOcityId());
+        ws.setOcity(icr.getOcity());
+        ws.setOdistrictId(icr.getOdistrictId());
+        ws.setOdistrict(icr.getOdistrict());
+        ws.setProvinceId(icr.getProvinceId());
+        ws.setProvince(icr.getProvince());
+        ws.setCityId(icr.getCityId());
+        ws.setCity(icr.getCity());
+        ws.setDistrictId(icr.getDistrictId());
+        ws.setDistrict(icr.getDistrict());
+        ws.setAddress(icr.getAddress());
+        ws.setRegisterOntime(icr.getRegisterOntime());
+        ws.setZipCode(icr.getZipCode());
+        ws.setTrafficMethod(icr.getTrafficMethod());
+        ws.setArrive(icr.getArrive());
+        ws.setArrvieDate(icr.getArrvieDate());
+        ws.setArriveTimeId(icr.getArriveTimeId());
+        ws.setFillStatus("已填报");
+        //家庭成员
+        List<WelcomeFamily> wfs = new ArrayList<>();
+        if(icr.getFvs() != null && icr.getFvs().size() > 0){
+            for (FamilyVo fv:icr.getFvs()) {
+                WelcomeFamily wf = new WelcomeFamily();
+                wf.setName(fv.getName());
+                wf.setPhone(fv.getPhone());
+                wf.setWorkUnit(fv.getWorkUnit());
+                wf.setFamilyShip(fv.getFamilyShip());
+                wf.setStudentCard(icr.getCardId());
+                wfs.add(wf);
+            }
+        }
+
+        //陪同人员
+        List<WelcomeAccompany> was = new ArrayList<>();
+        if(icr.getAvs() != null && icr.getAvs().size() > 0){
+            for (AccompanyVo av:icr.getAvs()) {
+                WelcomeAccompany wa = new WelcomeAccompany();
+                wa.setName(av.getName());
+                wa.setPhone(av.getPhone());
+                wa.setStudentCard(icr.getCardId());
+                was.add(wa);
+            }
+        }
+
+        try{
+            boolean resultWs = welcomeStudentService.saveOrUpdate(ws);
+            if(!resultWs){
+                logger.error("采集学生信息失败，ws参数：" + JSON.toJSON(ws));
+                throw new Exception("采集学生信息失败！");
+            }
+            boolean resultWf = welcomeFamilyService.saveBatch(wfs);
+            if(!resultWf){
+                logger.error("采集学生信息失败，wfs参数：" + JSON.toJSON(wfs));
+                throw new Exception("采集学生信息失败！");
+            }
+            boolean resultWa = welcomeAccompanyService.saveBatch(was);
+            if(!resultWa){
+                logger.error("采集学生信息失败，was参数：" + JSON.toJSON(was));
+                throw new Exception("采集学生信息失败！");
+            }
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            throw new Exception("采集失败！");
+        }
+
+        return CommonResult.ok("采集完成！");
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult deleteStudentInfo( int id) throws Exception {
+
+        WelcomeStudent ws = welcomeStudentService.getManageById(id);
+        if(ws == null){
+            return CommonResult.fail("学生信息已失效，无法进行删除操作！");
+        }
+        try {
+            //删除学生数据
+            int deleteStudent = welcomeStudentService.deleteWelcomeStudentById(id);
+            if(deleteStudent <= 0){
+                logger.error("删除学生信息失败，id参数：" + JSON.toJSON(id));
+                throw new Exception("删除学生信息失败！");
+            }
+            //删除宿舍数据
+            int deleteSd = welcomeStudentDormitoryService.deleteWelcomeStudentDormitoryByCard(ws.getCardId());
+            //删除同行人员
+            int deleteWa = welcomeAccompanyService.deleteWelcomeAccompanyByCard(ws.getCardId());
+            //删除家庭成员
+            int deletef = welcomeFamilyService.deleteWelcomeFamilyByCard(ws.getCardId());
+
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            throw new Exception("删除失败！");
+        }
+
+        return CommonResult.ok("删除成功");
+    }
 }
 

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

@@ -1,10 +1,30 @@
 package com.template.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.template.annotation.PassToken;
+import com.template.api.WelcomeStudentDormitoryControllerAPI;
+import com.template.model.pojo.WelcomeDormitory;
+import com.template.model.pojo.WelcomeStudent;
+import com.template.model.pojo.WelcomeStudentDormitory;
+import com.template.model.result.CommonResult;
+import com.template.model.vo.DormitoryDetailsVo;
+import com.template.services.WelcomeDormitoryService;
+import com.template.services.WelcomeStudentDormitoryService;
+import com.template.services.WelcomeStudentService;
+import javafx.beans.binding.SetBinding;
+import org.aspectj.weaver.ast.Var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +34,88 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2025-06-13
  */
 @RestController
-@RequestMapping("/auto/welcome-student-dormitory")
-public class WelcomeStudentDormitoryController {
 
+public class WelcomeStudentDormitoryController implements WelcomeStudentDormitoryControllerAPI {
+
+    @Autowired
+    WelcomeStudentDormitoryService welcomeStudentDormitoryService;
+
+    @Autowired
+    WelcomeStudentService welcomeStudentService;
+
+    @Autowired
+    WelcomeDormitoryService welcomeDormitoryService;
+
+    @Override
+    public CommonResult submit(WelcomeStudentDormitory welcomeStudentDormitory) {
+        String studentCard = welcomeStudentDormitory.getStudentCard();
+        LambdaQueryWrapper<WelcomeStudentDormitory> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudentDormitory::getStudentCard,studentCard);
+        WelcomeStudentDormitory one = welcomeStudentDormitoryService.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("已添加宿舍信息，请勿重复添加");
+        }
+
+        boolean save = welcomeStudentDormitoryService.save(welcomeStudentDormitory);
+        if (save) {
+            return CommonResult.ok();
+        }
+        return CommonResult.fail();
+    }
+
+    @Override
+    public CommonResult dormitoryDetails( String buildName, String dormitoryName, String studentCard) {
+
+        //        查询对应床位数量
+        LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeDormitory::getBuild,buildName)
+                .eq(WelcomeDormitory::getDormitory,dormitoryName);
+        WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getOne(wrapper);
+//        获取床位数
+        Integer bedNumber = welcomeDormitory.getBedNumber();
+
+
+        //        查找哪些已经入住了
+        LambdaQueryWrapper<WelcomeStudentDormitory> wrapperStudentDormitory=new LambdaQueryWrapper<>();
+        wrapperStudentDormitory.eq(WelcomeStudentDormitory::getBuilding,buildName)
+                .eq(WelcomeStudentDormitory::getDormitory,dormitoryName);
+        List<WelcomeStudentDormitory> list1 = welcomeStudentDormitoryService.list(wrapperStudentDormitory);
+
+        LambdaQueryWrapper<WelcomeStudentDormitory> wrapperOne=new LambdaQueryWrapper<>();
+        wrapperOne.eq(WelcomeStudentDormitory::getStudentCard,studentCard);
+        WelcomeStudentDormitory studentDormitory = welcomeStudentDormitoryService.getOne(wrapperOne);
+        Integer bedNum1 = Integer.valueOf(studentDormitory.getBedNum());
+
+
+        LambdaQueryWrapper<WelcomeStudent> wrapperStudent=new LambdaQueryWrapper<>();
+        wrapperStudent.eq(WelcomeStudent::getCardId,studentCard);
+        WelcomeStudent one = welcomeStudentService.getOne(wrapperStudent);
+
+
+        ArrayList<DormitoryDetailsVo> dormitoryDetailsVos = new ArrayList<>();
+        for (int i = 1; i <= bedNumber; i++) {
+            DormitoryDetailsVo dormitoryDetailsVo = new DormitoryDetailsVo();
+            dormitoryDetailsVo.setBedNum(i+"");
+            dormitoryDetailsVo.setDormitory(dormitoryName);
+            dormitoryDetailsVo.setBuilding(buildName);
+            if (bedNum1==i) {
+                dormitoryDetailsVo.setStatus(1);
+                dormitoryDetailsVo.setWelcomeStudent(one);
+            }else {
+//            默认设置成没人
+                dormitoryDetailsVo.setStatus(2);
+                for (WelcomeStudentDormitory welcomeStudentDormitory : list1) {
+                    Integer bedNum = Integer.valueOf(welcomeStudentDormitory.getBedNum());
+                    if (i == bedNum) {
+                        dormitoryDetailsVo.setStatus(1);
+                        break;
+                    }
+                }
+            }
+            dormitoryDetailsVos.add(dormitoryDetailsVo);
+        }
+
+        return CommonResult.ok(dormitoryDetailsVos);
+    }
 }
 

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

@@ -2,8 +2,12 @@ package com.template.mapper;
 
 import com.template.model.pojo.WelcomeDormitory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +19,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
 
+    List<String> groupBuild(@Param("sex") String sex,@Param("college") String college,@Param("gradestr") String gradestr,@Param("school")String school);
+
+    List<String> groupDormitory(@Param("sex") String sex,@Param("college") String college,@Param("gradestr") String gradestr,@Param("school")String school, @Param("buildName") String buildName);
 }

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

@@ -2,6 +2,7 @@ package com.template.mapper;
 
 import com.template.model.pojo.WelcomeOrg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ceshi
  * @since 2025-06-16
  */
+@Repository
 public interface WelcomeOrgMapper extends BaseMapper<WelcomeOrg> {
 
 }

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

@@ -17,5 +17,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
-    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("college") String college,@Param("major") String major,@Param("classstr") String classstr,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
+    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeId") Integer collegeId,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
 }

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

@@ -52,12 +52,18 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "所属学院")
     private String college;
 
-    @ApiModelProperty(value = "所属年级")
-    private String gradestr;
+    @ApiModelProperty(value = "所属学院ID")
+    private Integer collegeId;
+
+    @ApiModelProperty(value = "所属专业ID")
+    private Integer majorId;
 
     @ApiModelProperty(value = "所属班级")
     private String classstr;
 
+    @ApiModelProperty(value = "所属班级ID")
+    private Integer classstrId;
+
     @ApiModelProperty(value = "是否入住")
     private Integer isCheck;
 

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

@@ -49,12 +49,21 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "所属学院")
     private String college;
 
-    @ApiModelProperty(value = "所属年级")
-    private String gradestr;
+    @ApiModelProperty(value = "所属专业")
+    private String major;
+
+    @ApiModelProperty(value = "所属学院ID")
+    private Integer collegeId;
+
+    @ApiModelProperty(value = "所属专业ID")
+    private Integer majorId;
 
     @ApiModelProperty(value = "床位数")
     private Integer bedNumber;
 
+    @ApiModelProperty(value = "所属年级")
+    private String gradestr;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

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

@@ -56,12 +56,21 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "院系")
     private String college;
 
+    @ApiModelProperty(value = "院系ID")
+    private Integer collegeId;
+
     @ApiModelProperty(value = "专业")
     private String major;
 
+    @ApiModelProperty(value = "专业ID")
+    private Integer majorId;
+
     @ApiModelProperty(value = "班级")
     private String classstr;
 
+    @ApiModelProperty(value = "班级ID")
+    private Integer classstrId;
+
     @ApiModelProperty(value = "考生号")
     private String examNum;
 
@@ -86,27 +95,48 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "籍贯省")
     private Integer oprovinceId;
 
+    @ApiModelProperty(value = "籍贯区")
+    private String oprovince;
+
     @ApiModelProperty(value = "籍贯市")
     private Integer ocityId;
 
     @ApiModelProperty(value = "籍贯区")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区")
     private Integer odistrictId;
 
+    @ApiModelProperty(value = "籍贯区")
+    private String odistrict;
+
     @ApiModelProperty(value = "省ID")
     private Integer provinceId;
 
+    @ApiModelProperty(value = "省")
+    private String province;
+
     @ApiModelProperty(value = "市ID")
     private Integer cityId;
 
+    @ApiModelProperty(value = "市")
+    private String city;
+
     @ApiModelProperty(value = "区ID")
     private Integer districtId;
 
+    @ApiModelProperty(value = "区")
+    private String district;
+
     @ApiModelProperty(value = "家庭住址")
     private String address;
 
     @ApiModelProperty(value = "交通方式")
     private String trafficMethod;
 
+    @ApiModelProperty(value = "填报状态")
+    private String fillStatus;
+
     @ApiModelProperty(value = "到站地点")
     private String arrive;
 
@@ -116,6 +146,9 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "到站时间")
     private String arriveTime;
 
+    @ApiModelProperty(value = "到站时间段")
+    private Integer arriveTimeId;
+
     @ApiModelProperty(value = "应缴金额")
     private BigDecimal amountPayable;
 
@@ -125,6 +158,12 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "是否自驾")
     private Integer isDrive;
 
+    @ApiModelProperty(value = "是否按时报到")
+    private Integer registerOntime;
+
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 

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

@@ -0,0 +1,147 @@
+package com.template.model.request;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.template.model.vo.AccompanyVo;
+import com.template.model.vo.ArriveTimeVo;
+import com.template.model.vo.FamilyVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/4/18 星期二 9:54
+ * @Description: com.video.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class InfoCollectionRequest {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "录取号")
+    private String admissNum;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "照片")
+    private String picture;
+
+    @ApiModelProperty(value = "身份证号")
+    private String cardId;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "出生年月")
+    private String birthday;
+
+    @ApiModelProperty(value = "院系")
+    private String college;
+
+    @ApiModelProperty(value = "专业")
+    private String major;
+
+    @ApiModelProperty(value = "班级")
+    private String classstr;
+
+    @ApiModelProperty(value = "院系ID")
+    private Integer collegeId;
+
+    @ApiModelProperty(value = "专业ID")
+    private Integer majorId;
+
+    @ApiModelProperty(value = "班级ID")
+    private Integer classstrId;
+
+    @ApiModelProperty(value = "考生号")
+    private String examNum;
+
+    @ApiModelProperty(value = "学制")
+    private String eduSystem;
+
+    @ApiModelProperty(value = "毕业中学")
+    private String graduationSchool;
+
+    @ApiModelProperty(value = "批次")
+    private String batchValue;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalStatu;
+
+    @ApiModelProperty(value = "民族")
+    private String nationality;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "籍贯省ID")
+    private Integer oprovinceId;
+
+    @ApiModelProperty(value = "籍贯省")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市ID")
+    private Integer ocityId;
+
+    @ApiModelProperty(value = "籍贯市")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区ID")
+    private Integer odistrictId;
+
+    @ApiModelProperty(value = "籍贯区")
+    private String odistrict;
+
+    @ApiModelProperty(value = "省ID")
+    private Integer provinceId;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市ID")
+    private Integer cityId;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区ID")
+    private Integer districtId;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String address;
+
+    @ApiModelProperty(value = "是否按时报到")
+    private Integer registerOntime;
+
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
+    @ApiModelProperty(value = "交通方式")
+    private String trafficMethod;
+
+    @ApiModelProperty(value = "到站地点")
+    private String arrive;
+
+    @ApiModelProperty(value = "到站日期")
+    private Date arrvieDate;
+
+    @ApiModelProperty(value = "到站时间")
+    private String arriveTime;
+
+    @ApiModelProperty(value = "到站时间段")
+    private Integer arriveTimeId;
+
+    @ApiModelProperty(value = "家庭成员集合")
+    private List<FamilyVo> fvs;
+
+    @ApiModelProperty(value = "陪同人员集合")
+    private List<AccompanyVo> avs;
+}

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

@@ -50,6 +50,15 @@ public class InsertStudentRequest implements Serializable {
     @ApiModelProperty(value = "班级")
     private String classstr;
 
+    @ApiModelProperty(value = "院系ID")
+    private Integer collegeId;
+
+    @ApiModelProperty(value = "专业ID")
+    private Integer majorId;
+
+    @ApiModelProperty(value = "班级ID")
+    private Integer classstrId;
+
     @ApiModelProperty(value = "考生号")
     private String examNum;
 

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

@@ -0,0 +1,22 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class AccompanyVo {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+}

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

@@ -0,0 +1,27 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class ArriveTimeVo {
+    //数据ID
+    private Integer id;
+
+    //是否选中
+    private Integer isCheck;
+
+    //开始时间
+    private String startTime;
+
+    //结束时间
+    private String endTime;
+
+    //时间段
+    private String timeStr;
+}

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

@@ -0,0 +1,23 @@
+package com.template.model.vo;
+
+import com.template.model.pojo.WelcomeStudent;
+import com.template.services.WelcomeStudentService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DormitoryDetailsVo {
+    private WelcomeStudent welcomeStudent;
+
+    @ApiModelProperty(value = "楼栋")
+    private String building;
+
+    @ApiModelProperty(value = "寝室号")
+    private String dormitory;
+
+    @ApiModelProperty(value = "床位号")
+    private String bedNum;
+
+    @ApiModelProperty(value = "状态，1有人，2无人")
+    private Integer status;
+}

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

@@ -0,0 +1,28 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class FamilyVo {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "称谓")
+    private String familyShip;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "工作单位")
+    private String workUnit;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+}

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

@@ -0,0 +1,20 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/16 星期一 11:28
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class ListVo {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+}

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

@@ -0,0 +1,171 @@
+package com.template.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/4/18 星期二 9:54
+ * @Description: com.video.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class StudentDetailVo {
+    @ApiModelProperty(value = "数据ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "录取号")
+    private String admissNum;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "照片")
+    private String picture;
+
+    @ApiModelProperty(value = "身份证号")
+    private String cardId;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "出生年月")
+    private String birthday;
+
+    @ApiModelProperty(value = "院系")
+    private String college;
+
+    @ApiModelProperty(value = "专业")
+    private String major;
+
+    @ApiModelProperty(value = "班级")
+    private String classstr;
+
+    @ApiModelProperty(value = "院系")
+    private Integer collegeId;
+
+    @ApiModelProperty(value = "专业")
+    private Integer majorId;
+
+    @ApiModelProperty(value = "班级")
+    private Integer classstrId;
+
+    @ApiModelProperty(value = "考生号")
+    private String examNum;
+
+    @ApiModelProperty(value = "学制")
+    private String eduSystem;
+
+    @ApiModelProperty(value = "毕业中学")
+    private String graduationSchool;
+
+    @ApiModelProperty(value = "批次")
+    private String batchValue;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalStatu;
+
+    @ApiModelProperty(value = "民族")
+    private String nationality;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "籍贯省ID")
+    private Integer oprovinceId;
+
+    @ApiModelProperty(value = "籍贯省")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市ID")
+    private Integer ocityId;
+
+    @ApiModelProperty(value = "籍贯市")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区ID")
+    private Integer odistrictId;
+
+    @ApiModelProperty(value = "籍贯区")
+    private String odistrict;
+
+    @ApiModelProperty(value = "省ID")
+    private Integer provinceId;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市ID")
+    private Integer cityId;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区ID")
+    private Integer districtId;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String address;
+
+    @ApiModelProperty(value = "是否按时报到")
+    private Integer registerOntime;
+
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
+    @ApiModelProperty(value = "交通方式")
+    private String trafficMethod;
+
+    @ApiModelProperty(value = "到站地点")
+    private String arrive;
+
+    @ApiModelProperty(value = "到站日期")
+    private Date arrvieDate;
+
+    @ApiModelProperty(value = "到站时间段")
+    @JsonIgnore
+    private Integer arriveTimeId;
+
+    @ApiModelProperty(value = "到站时间段集合")
+    private List<ArriveTimeVo> ats;
+
+    @ApiModelProperty(value = "家庭成员集合")
+    private List<FamilyVo> fvs;
+
+    @ApiModelProperty(value = "陪同人员集合")
+    private List<AccompanyVo> avs;
+
+    @ApiModelProperty(value = "时间段集合")
+    private List<ArriveTimeVo> atvs;
+
+    @ApiModelProperty(value = "楼栋")
+    private String building;
+
+    @ApiModelProperty(value = "寝室号")
+    private String dormitory;
+
+    @ApiModelProperty(value = "床位号")
+    private String bedNum;
+
+    @ApiModelProperty(value = "应缴金额")
+    private BigDecimal amountPayable;
+
+    @ApiModelProperty(value = "实付金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "是否自驾")
+    private Integer isDrive;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+}

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

@@ -25,4 +25,8 @@ public interface WelcomeAccompanyService extends IService<WelcomeAccompany> {
 
     WelcomeAccompany getManageById(String id);
 
+    List<WelcomeAccompany> getManageByCardId(String cardId);
+
+    int deleteWelcomeAccompanyByCard(String cardId);
+
 }

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

@@ -5,6 +5,8 @@ import com.template.model.pojo.WelcomeArriveSetting;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -23,4 +25,6 @@ public interface WelcomeArriveSettingService extends IService<WelcomeArriveSetti
     int deleteWelcomeArriveSettingById(String id);
 
     WelcomeArriveSetting getManageById(String id);
+
+    List<WelcomeArriveSetting> queryCheckDatas();
 }

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

@@ -5,6 +5,8 @@ import com.template.model.pojo.WelcomeDormitory;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -23,4 +25,8 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     int deleteWelcomeDormitoryById(String id);
 
     WelcomeDormitory getManageById(String id);
+
+    List<String> groupBuild(String sex,String college,String gradestr,String school);
+
+    List<String> groupDormitory(String sex,String college,String gradestr,String school,String buildName);
 }

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

@@ -5,6 +5,8 @@ import com.template.model.pojo.WelcomeFamily;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -23,4 +25,8 @@ public interface WelcomeFamilyService extends IService<WelcomeFamily> {
     int deleteWelcomeFamilyById(String id);
 
     WelcomeFamily getManageById(String id);
+
+    List<WelcomeFamily> getManageByCardId(String cardId);
+
+    int deleteWelcomeFamilyByCard(String cardId);
 }

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

@@ -3,6 +3,8 @@ package com.template.services;
 import com.template.model.pojo.WelcomeOrg;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +14,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2025-06-16
  */
 public interface WelcomeOrgService extends IService<WelcomeOrg> {
+    //获取学院下拉数据
+    List<WelcomeOrg> queryColleges();
+
+    //获取专业下拉数据
+    List<WelcomeOrg> queryMajors(Integer collegeId);
 
+    //获取班级下拉数据
+    List<WelcomeOrg> queryClasss(Integer majorId);
 }

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

@@ -23,4 +23,8 @@ public interface WelcomeStudentDormitoryService extends IService<WelcomeStudentD
     int deleteWelcomeStudentDormitoryById(String id);
 
     WelcomeStudentDormitory getManageById(String id);
+
+    WelcomeStudentDormitory getManageByCardId(String cardId);
+
+    int deleteWelcomeStudentDormitoryByCard(String cardId);
 }

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

@@ -21,13 +21,14 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     int updateWelcomeStudent(WelcomeStudent rns);
 
-    int deleteWelcomeStudentById(String id);
+    int deleteWelcomeStudentById(Integer id);
 
-    WelcomeStudent getManageById(String id);
+    WelcomeStudent getManageById(Integer id);
 
     int existStudentInfo(String admissNum,String cardId);
 
     WelcomeStudent getDataByIdcard(String cardId);
 
-    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, String college, String major, String classstr, String trafficMethod ,String name);
+    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod ,String name);
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.model.pojo.WelcomeAccompany;
 import com.template.mapper.WelcomeAccompanyMapper;
+import com.template.model.pojo.WelcomeFamily;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.RoleDetailsVO;
 import com.template.services.WelcomeAccompanyService;
@@ -62,4 +63,20 @@ public class WelcomeAccompanyServiceImpl extends ServiceImpl<WelcomeAccompanyMap
         return result;
     }
 
+    @Override
+    public List<WelcomeAccompany> getManageByCardId(String cardId) {
+        QueryWrapper<WelcomeAccompany> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(cardId), "student_card", cardId);
+        List<WelcomeAccompany> result = welcomeAccompanyMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public int deleteWelcomeAccompanyByCard(String cardId) {
+        QueryWrapper<WelcomeAccompany> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(cardId), "student_card", cardId);
+        int result = welcomeAccompanyMapper.delete(queryWrapper);
+        return result;
+    }
+
 }

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

@@ -13,6 +13,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>
  *  服务实现类
@@ -59,4 +61,12 @@ public class WelcomeArriveSettingServiceImpl extends ServiceImpl<WelcomeArriveSe
         WelcomeArriveSetting result = welcomeArriveSettingMapper.selectById(id);
         return result;
     }
+
+    @Override
+    public List<WelcomeArriveSetting> queryCheckDatas() {
+        QueryWrapper<WelcomeArriveSetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_check",1);
+        List<WelcomeArriveSetting> result = welcomeArriveSettingMapper.selectList(queryWrapper);
+        return result;
+    }
 }

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

@@ -13,6 +13,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>
  *  服务实现类
@@ -59,4 +61,16 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         WelcomeDormitory result = welcomeDormitoryMapper.selectById(id);
         return result;
     }
+
+    @Override
+    public List<String> groupBuild(String sex,String college,String gradestr,String school) {
+        List<String> result = welcomeDormitoryMapper.groupBuild(sex,college,gradestr,school);
+        return result;
+    }
+
+    @Override
+    public List<String> groupDormitory(String sex,String college,String gradestr,String school,String buildName) {
+        List<String> result = welcomeDormitoryMapper.groupDormitory(sex,college,gradestr,buildName,school);
+        return result;
+    }
 }

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

@@ -7,15 +7,19 @@ import com.template.mapper.WelcomeFamilyMapper;
 import com.template.model.pojo.WelcomeFamily;
 import com.template.model.pojo.WelcomeFamily;
 import com.template.mapper.WelcomeFamilyMapper;
+import com.template.model.pojo.WelcomeStudentDormitory;
 import com.template.model.result.PageUtils;
 import com.template.services.WelcomeFamilyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -44,7 +48,7 @@ public class WelcomeFamilyServiceImpl extends ServiceImpl<WelcomeFamilyMapper, W
         Page<WelcomeFamily> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeFamily> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("update_time");
-        IPage<WelcomeFamily> result = welcomeFamilyMapper.selectPage(page,queryWrapper);
+        IPage<WelcomeFamily> result = welcomeFamilyMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
@@ -59,4 +63,20 @@ public class WelcomeFamilyServiceImpl extends ServiceImpl<WelcomeFamilyMapper, W
         WelcomeFamily result = welcomeFamilyMapper.selectById(id);
         return result;
     }
+
+    @Override
+    public List<WelcomeFamily> getManageByCardId(String cardId) {
+        QueryWrapper<WelcomeFamily> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(cardId), "student_card", cardId);
+        List<WelcomeFamily> result = welcomeFamilyMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public int deleteWelcomeFamilyByCard(String cardId) {
+        QueryWrapper<WelcomeFamily> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(cardId), "student_card", cardId);
+        int result = welcomeFamilyMapper.delete(queryWrapper);
+        return result;
+    }
 }

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

@@ -1,11 +1,16 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.template.mapper.WelcomePaySettingMapper;
 import com.template.model.pojo.WelcomeOrg;
 import com.template.mapper.WelcomeOrgMapper;
 import com.template.services.WelcomeOrgService;
 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>
  *  服务实现类
@@ -17,4 +22,32 @@ import org.springframework.stereotype.Service;
 @Service
 public class WelcomeOrgServiceImpl extends ServiceImpl<WelcomeOrgMapper, WelcomeOrg> implements WelcomeOrgService {
 
+    @Autowired
+    private WelcomeOrgMapper welcomeOrgMapper;
+
+    @Override
+    public List<WelcomeOrg> queryColleges() {
+        QueryWrapper<WelcomeOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type_id",1);
+        List<WelcomeOrg> result = welcomeOrgMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeOrg> queryMajors(Integer collegeId) {
+        QueryWrapper<WelcomeOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type_id",2);
+        queryWrapper.eq("parent_id",collegeId);
+        List<WelcomeOrg> result = welcomeOrgMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeOrg> queryClasss(Integer majorId) {
+        QueryWrapper<WelcomeOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type_id",3);
+        queryWrapper.eq("parent_id",majorId);
+        List<WelcomeOrg> result = welcomeOrgMapper.selectList(queryWrapper);
+        return result;
+    }
 }

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

@@ -12,6 +12,7 @@ import com.template.services.WelcomeStudentDormitoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 /**
  * <p>
@@ -59,4 +60,20 @@ public class WelcomeStudentDormitoryServiceImpl extends ServiceImpl<WelcomeStude
         WelcomeStudentDormitory result = welcomeStudentDormitoryMapper.selectById(id);
         return result;
     }
+
+    @Override
+    public WelcomeStudentDormitory getManageByCardId(String cardId) {
+        QueryWrapper<WelcomeStudentDormitory> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(cardId), "student_card", cardId);
+        WelcomeStudentDormitory result = welcomeStudentDormitoryMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public int deleteWelcomeStudentDormitoryByCard(String cardId) {
+        QueryWrapper<WelcomeStudentDormitory> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(cardId), "student_card", cardId);
+        int result = welcomeStudentDormitoryMapper.delete(queryWrapper);
+        return result;
+    }
 }

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

@@ -43,13 +43,13 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public int deleteWelcomeStudentById(String id) {
+    public int deleteWelcomeStudentById(Integer id) {
         int result = welcomeStudentMapper.deleteById(id);
         return result;
     }
 
     @Override
-    public WelcomeStudent getManageById(String id) {
+    public WelcomeStudent getManageById(Integer id) {
         WelcomeStudent result = welcomeStudentMapper.selectById(id);
         return result;
     }
@@ -73,11 +73,11 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, String college, String major, String classstr, String trafficMethod, String name) {
+    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
         Page<StudentPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, college, major, classstr, trafficMethod, name);
+        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeId, majorId, classstrId, trafficMethod, name);
         return new PageUtils(result);
     }
 }

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

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.WelcomeDormitoryMapper">
 
+    <select id="groupBuild" resultType="java.lang.String">
+        SELECT build
+        FROM `welcome_dormitory`
+        WHERE deleted = 0
+        AND sex= #{sex}
+        AND college= #{college}
+        AND gradestr= #{gradestr}
+        AND school= #{school}
+        GROUP BY build
+    </select>
+
+    <select id="groupDormitory" resultType="java.lang.String">
+        SELECT dormitory
+        FROM `welcome_dormitory`
+        WHERE deleted = 0
+          AND sex= #{sex}
+          AND college= #{college}
+          AND gradestr= #{gradestr}
+          AND school= #{school}
+          AND build = #{buildName}
+        GROUP BY dormitory
+    </select>
 </mapper>

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

@@ -25,14 +25,14 @@
         left join welcome_student_dormitory wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
         from welcome_student ws
         where ws.deleted = 0
-        <if test="college != null and college != ''">
-            ws.college = #{college}
+        <if test="collegeId != null and collegeId != ''">
+            ws.college_id = #{collegeId}
         </if>
-        <if test="major != null and major != ''">
-            ws.major = #{major}
+        <if test="majorId != null and majorId != ''">
+            ws.major_id = #{majorId}
         </if>
-        <if test="classstr != null and classstr != ''">
-            ws.classstr = #{classstr}
+        <if test="classstrId != null and classstrId != ''">
+            ws.classstr_id = #{classstrId}
         </if>
         <if test="trafficMethod != null and trafficMethod != ''">
             ws.trafficMethod = #{trafficMethod}