夏文涛 1 год назад
Родитель
Сommit
d7bcf624c7
28 измененных файлов с 438 добавлено и 25 удалено
  1. 4 0
      src/main/java/com/template/api/WelcomeStudentControllerAPI.java
  2. 0 1
      src/main/java/com/template/controller/WelcomeAccompanyController.java
  3. 0 1
      src/main/java/com/template/controller/WelcomeAccountController.java
  4. 0 1
      src/main/java/com/template/controller/WelcomeArriveSettingController.java
  5. 0 1
      src/main/java/com/template/controller/WelcomeBedController.java
  6. 0 1
      src/main/java/com/template/controller/WelcomeBuildController.java
  7. 0 1
      src/main/java/com/template/controller/WelcomeDormitoryController.java
  8. 0 1
      src/main/java/com/template/controller/WelcomeFamilyController.java
  9. 0 1
      src/main/java/com/template/controller/WelcomeOpenSettingController.java
  10. 0 1
      src/main/java/com/template/controller/WelcomePaySettingController.java
  11. 0 1
      src/main/java/com/template/controller/WelcomeSettingController.java
  12. 114 10
      src/main/java/com/template/controller/WelcomeStudentController.java
  13. 0 1
      src/main/java/com/template/controller/WelcomeStudentDormitoryController.java
  14. 27 0
      src/main/java/com/template/model/pojo/WelcomeStudent.java
  15. 22 0
      src/main/java/com/template/model/vo/AccompanyVo.java
  16. 27 0
      src/main/java/com/template/model/vo/ArriveTimeVo.java
  17. 28 0
      src/main/java/com/template/model/vo/FamilyVo.java
  18. 162 0
      src/main/java/com/template/model/vo/StudentDetailVo.java
  19. 2 0
      src/main/java/com/template/services/WelcomeAccompanyService.java
  20. 4 0
      src/main/java/com/template/services/WelcomeArriveSettingService.java
  21. 4 0
      src/main/java/com/template/services/WelcomeFamilyService.java
  22. 2 0
      src/main/java/com/template/services/WelcomeStudentDormitoryService.java
  23. 1 1
      src/main/java/com/template/services/WelcomeStudentService.java
  24. 8 0
      src/main/java/com/template/services/impl/WelcomeAccompanyServiceImpl.java
  25. 10 0
      src/main/java/com/template/services/impl/WelcomeArriveSettingServiceImpl.java
  26. 13 2
      src/main/java/com/template/services/impl/WelcomeFamilyServiceImpl.java
  27. 9 0
      src/main/java/com/template/services/impl/WelcomeStudentDormitoryServiceImpl.java
  28. 1 1
      src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

+ 4 - 0
src/main/java/com/template/api/WelcomeStudentControllerAPI.java

@@ -23,4 +23,8 @@ public interface WelcomeStudentControllerAPI {
     @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);
+
+    @GetMapping(value = "/queryStudentDetail")
+    @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
+    CommonResult queryStudentDetail(@RequestParam int id);
 }

+ 0 - 1
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 {
 
 }

+ 0 - 1
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 {
 
 }

+ 0 - 1
src/main/java/com/template/controller/WelcomeArriveSettingController.java

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

+ 0 - 1
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 {
 
 }

+ 0 - 1
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 {
 
 }

+ 0 - 1
src/main/java/com/template/controller/WelcomeDormitoryController.java

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

+ 0 - 1
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 {
 
 }

+ 0 - 1
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 {
 
 }

+ 0 - 1
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 {
 
 }

+ 0 - 1
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 {
 
 }

+ 114 - 10
src/main/java/com/template/controller/WelcomeStudentController.java

@@ -4,20 +4,14 @@ 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.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 +51,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Autowired
     private WelcomeStudentDormitoryService welcomeStudentDormitoryService;
 
+    @Autowired
+    private WelcomeArriveSettingService welcomeArriveSettingService;
+
     private static Logger logger = LoggerFactory.getLogger(WelcomeStudentController.class);
 
     @Override
@@ -170,7 +167,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("添加失败!");
             }
@@ -187,5 +184,112 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         PageUtils<StudentPageVo> result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, college, major, classstr, 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);
+            }
+
+        }
+
+        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.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);
+    }
 }
 

+ 0 - 1
src/main/java/com/template/controller/WelcomeStudentDormitoryController.java

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

+ 27 - 0
src/main/java/com/template/model/pojo/WelcomeStudent.java

@@ -86,21 +86,39 @@ 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;
 
@@ -116,6 +134,9 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "到站时间")
     private String arriveTime;
 
+    @ApiModelProperty(value = "到站时间段")
+    private Integer arriveTimeId;
+
     @ApiModelProperty(value = "应缴金额")
     private BigDecimal amountPayable;
 
@@ -125,6 +146,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;
 

+ 22 - 0
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;
+}

+ 27 - 0
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;
+}

+ 28 - 0
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;
+}

+ 162 - 0
src/main/java/com/template/model/vo/StudentDetailVo.java

@@ -0,0 +1,162 @@
+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 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 = "籍贯省")
+    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 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;
+}

+ 2 - 0
src/main/java/com/template/services/WelcomeAccompanyService.java

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

+ 4 - 0
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();
 }

+ 4 - 0
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,6 @@ public interface WelcomeFamilyService extends IService<WelcomeFamily> {
     int deleteWelcomeFamilyById(String id);
 
     WelcomeFamily getManageById(String id);
+
+    List<WelcomeFamily> getManageByCardId(String cardId);
 }

+ 2 - 0
src/main/java/com/template/services/WelcomeStudentDormitoryService.java

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

+ 1 - 1
src/main/java/com/template/services/WelcomeStudentService.java

@@ -23,7 +23,7 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     int deleteWelcomeStudentById(String id);
 
-    WelcomeStudent getManageById(String id);
+    WelcomeStudent getManageById(Integer id);
 
     int existStudentInfo(String admissNum,String cardId);
 

+ 8 - 0
src/main/java/com/template/services/impl/WelcomeAccompanyServiceImpl.java

@@ -62,4 +62,12 @@ 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;
+    }
+
 }

+ 10 - 0
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;
+    }
 }

+ 13 - 2
src/main/java/com/template/services/impl/WelcomeFamilyServiceImpl.java

@@ -12,10 +12,13 @@ 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 +47,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 +62,12 @@ 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;
+    }
 }

+ 9 - 0
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,12 @@ 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;
+    }
 }

+ 1 - 1
src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -49,7 +49,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public WelcomeStudent getManageById(String id) {
+    public WelcomeStudent getManageById(Integer id) {
         WelcomeStudent result = welcomeStudentMapper.selectById(id);
         return result;
     }