|
|
@@ -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);
|
|
|
+ }
|
|
|
}
|
|
|
|