优化拆线呢

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

@@ -1575,6 +1575,59 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Override
     public CommonResult queryStudentByToken(String userId) {
         WelcomeStudent student = welcomeStudentService.getManageById(Integer.valueOf(userId));
+        if(student == null){
+            return CommonResult.fail("学生信息已失效，查询失败");
+        }
+
+        //家庭成员
+        List<FamilyVo> fvs = new ArrayList<>();
+        List<WelcomeFamily> familys = welcomeFamilyService.getManageByCardId(student.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);
+            }
+
+        }
+        student.setFvs(fvs);
+
+        //陪同人员
+        List<AccompanyVo> avs = new ArrayList<>();
+        List<WelcomeAccompany> accompanys = welcomeAccompanyService.getManageByCardId(student.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);
+            }
+        }
+        student.setAvs(avs);
+
+
+
+        //时间段
+        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((student.getArriveTimeId() != null && was.getId().equals(student.getArriveTimeId())) ? 1 : 0);
+                atvs.add(atv);
+            }
+        }
+        student.setAtvs(atvs);
+
         if (!(student.getIsPay() != null && student.getIsPay().intValue() == 1)) {
             List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(student.getAdmissNum(), TimeExchange.getYear());
             BigDecimal payAmount = new BigDecimal(BigInteger.ZERO);//实缴金额