Merge branch 'master' of 49.232.152.146:qangqi/dd_school

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolgrade/ISchoolGradeImpl.java

@@ -80,6 +80,7 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
         //如果是级部成员
         //如果是级部成员
         List<Long> ids = schoolGradeMapper.getMemberGradeId(userId, schoolYear);
         List<Long> ids = schoolGradeMapper.getMemberGradeId(userId, schoolYear);
         if (StringUtils.isNull(ids) || ids.size() == 0) {
         if (StringUtils.isNull(ids) || ids.size() == 0) {
+
             throw new ServiceException("当前学年为" + schoolYear + "学年，该学年没有您所在的级部信息");
             throw new ServiceException("当前学年为" + schoolYear + "学年，该学年没有您所在的级部信息");
         }
         }
         return ids.get(0);
         return ids.get(0);

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java

@@ -16,10 +16,8 @@ import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
 
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 
 
 
 /**
 /**
@@ -178,7 +176,15 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
         teacherFiles.setIdCard(schoolTeacher.getIdCard());
         teacherFiles.setIdCard(schoolTeacher.getIdCard());
         teacherFiles.setSex(schoolTeacher.getSex());
         teacherFiles.setSex(schoolTeacher.getSex());
         teacherFiles.setEducation(schoolTeacher.getEducation());
         teacherFiles.setEducation(schoolTeacher.getEducation());
-        teacherFiles.setAge(1);
+        System.out.println(schoolTeacher.getTeacherName()+"---------"+schoolTeacher.getBirthday());
+        Date birthday = schoolTeacher.getBirthday();
+        if(birthday!=null){
+            SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy");
+            Integer birthdayYear = Integer.valueOf(dateFormat.format(birthday));
+            Date date = new Date();
+            Integer nowYear = Integer.valueOf(dateFormat.format(date));
+            teacherFiles.setAge(nowYear-birthdayYear);
+        }
         teacherFiles.setTitle("");
         teacherFiles.setTitle("");
         teacherFiles.setAppearance("");
         teacherFiles.setAppearance("");
         return teacherFiles;
         return teacherFiles;

smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DdAppLoginController.java

@@ -78,6 +78,7 @@ public class DdAppLoginController {
         OapiUserGetuserinfoResponse response;
         OapiUserGetuserinfoResponse response;
         try {
         try {
             response = client.execute(request, access_token);
             response = client.execute(request, access_token);
+            System.out.println("-------------"+request);
         } catch (ApiException e) {
         } catch (ApiException e) {
             // TODO Auto-generated catch block
             // TODO Auto-generated catch block
             e.printStackTrace();
             e.printStackTrace();
@@ -115,8 +116,9 @@ public class DdAppLoginController {
         wxLoginBody.setOpenId(unionId);
         wxLoginBody.setOpenId(unionId);
         wxLoginBody.setParentTelephone(sysUser.getPhonenumber());
         wxLoginBody.setParentTelephone(sysUser.getPhonenumber());
         if (null != sysUser.getStudentId()){
         if (null != sysUser.getStudentId()){
-            SchoolStudent schoolStudent = schoolStudentMapper.selectByIdCard(sysUser.getStudentId().toString());
+            SchoolStudent schoolStudent = schoolStudentMapper.selectById(sysUser.getStudentId().toString());
             wxLoginBody.setStudentIdCard(schoolStudent.getIdCard());
             wxLoginBody.setStudentIdCard(schoolStudent.getIdCard());
+            wxLoginBody.setStudentName(schoolStudent.getStudentName());
         }
         }
         wxLoginBody.setParentName(sysUser.getUserName());
         wxLoginBody.setParentName(sysUser.getUserName());
         wxLoginBody.setTeacherName(sysUser.getUserName());
         wxLoginBody.setTeacherName(sysUser.getUserName());