优化登录

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

@@ -410,8 +410,8 @@ public class LoginController implements LoginControllerAPI {
             wlv.setAtvs(atvs);
         }
 
-        wlv.setSchool(campus);
-        wlv.setSchoolId(campus == null ? 0 : eSchool.stringOf(campus));
+        wlv.setSchool(!StringUtils.hasText(campus) ? "墨轩湖校区" : campus);
+        wlv.setSchoolId(!StringUtils.hasText(campus) ? 1 : eSchool.stringOf(campus));
 
         //籍贯
         wlv.setOprovinceId(student.getOprovinceId());

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

@@ -1630,6 +1630,56 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         if (ws == null) {
             return CommonResult.fail("当前学生信息已失效，查询失败");
         }
+
+        //家庭成员
+        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);
+            }
+
+        }
+        ws.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);
+            }
+        }
+        ws.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((ws.getArriveTimeId() != null && was.getId().equals(ws.getArriveTimeId())) ? 1 : 0);
+                atvs.add(atv);
+            }
+        }
+        ws.setAtvs(atvs);
+
         List<PayDetailVO> pdvs = new ArrayList<>();
         System.out.println("进支付比较");
         List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(ws.getAdmissNum(), TimeExchange.getYear());