社团成员信息接口修改2

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java

@@ -41,6 +41,7 @@ public class SchoolOrganizationMemberController extends BaseController
     @Autowired
     @Autowired
     private ISchoolOrganizationMemberService schoolOrganizationMemberService;
     private ISchoolOrganizationMemberService schoolOrganizationMemberService;
 
 
+    @Autowired
     private ISchoolStudentParentService schoolStudentParentService;
     private ISchoolStudentParentService schoolStudentParentService;
 
 
     /**
     /**

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java

@@ -13,10 +13,16 @@ import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin;
+import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
+import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
+import yangtz.cs.liu.campus.domain.student.SchoolStudent;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationFcService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationFcService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService;
+import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
+import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
+import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
 import yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoListVo;
 import yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoListVo;
 import yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoVo;
 import yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoVo;
 import yangtz.cs.liu.wechat.vo.organization.WxOrganizationSigninVo;
 import yangtz.cs.liu.wechat.vo.organization.WxOrganizationSigninVo;
@@ -49,6 +55,17 @@ public class WxSchoolOrganizationController extends BaseController {
     @Autowired
     @Autowired
     private UserInfoUtil userInfoUtil;
     private UserInfoUtil userInfoUtil;
 
 
+    @Autowired
+    private ISchoolStudentService schoolStudent;
+
+    @Autowired
+    private ISchoolClassService schoolClass;
+
+    @Autowired
+    private ISchoolGradeService schoolGrade;
+
+
+
     /**
     /**
      * 查询社团信息列表
      * 查询社团信息列表
      */
      */
@@ -59,7 +76,6 @@ public class WxSchoolOrganizationController extends BaseController {
 //        String studentName = userInfoUtil.getMpLoginUser().getStudentName();
 //        String studentName = userInfoUtil.getMpLoginUser().getStudentName();
 //        String studentIdCard = userInfoUtil.getMpLoginUser().getStudentIdCard();
 //        String studentIdCard = userInfoUtil.getMpLoginUser().getStudentIdCard();
         Long userId = userInfoUtil.getMpLoginUser().getUserId();
         Long userId = userInfoUtil.getMpLoginUser().getUserId();
-//        Long userId = 330L;
         LambdaQueryWrapper<SchoolOrganizationInfo> wrapper = Wrappers.lambdaQuery();
         LambdaQueryWrapper<SchoolOrganizationInfo> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(SchoolOrganizationInfo::getDelFlag,"0");
         wrapper.eq(SchoolOrganizationInfo::getDelFlag,"0");
         wrapper.orderByDesc(SchoolOrganizationInfo::getCreateTime);
         wrapper.orderByDesc(SchoolOrganizationInfo::getCreateTime);
@@ -141,8 +157,36 @@ public class WxSchoolOrganizationController extends BaseController {
         wrapper.eq(SchoolOrganizationSignin::getUserId,userId)
         wrapper.eq(SchoolOrganizationSignin::getUserId,userId)
                 .eq(SchoolOrganizationSignin::getCid,vo.getCid())
                 .eq(SchoolOrganizationSignin::getCid,vo.getCid())
                 .eq(SchoolOrganizationSignin::getDelFlag,"0");
                 .eq(SchoolOrganizationSignin::getDelFlag,"0");
-
-        return AjaxResult.success(schoolOrganizationSigninService.getOne(wrapper));
+        SchoolOrganizationSignin one = schoolOrganizationSigninService.getOne(wrapper);
+        if (one==null){
+            //根据studentId 获取当前登录人信息 返回给前端
+            Long studentId = userInfoUtil.getMpLoginUser().getStudentId();
+            LambdaQueryWrapper<SchoolStudent> wrapper2 = Wrappers.lambdaQuery();
+            wrapper2.eq(SchoolStudent::getId,studentId).eq(SchoolStudent::getDelFlag,"0");
+            SchoolStudent ss = schoolStudent.getOne(wrapper2);
+            //查询学生班级
+            LambdaQueryWrapper<SchoolClass> lqw = new LambdaQueryWrapper<>();
+            Long classId = ss.getClassId();
+            lqw.eq(SchoolClass::getId,classId).eq(SchoolClass::getDelFlag,"0");
+            SchoolClass sc = schoolClass.getOne(lqw);
+            Long gradeId = sc.getGradeId();
+            //查询级部
+            LambdaQueryWrapper<SchoolGrade> jb = new LambdaQueryWrapper<>();
+            jb.eq(SchoolGrade::getId,gradeId).eq(SchoolGrade::getDelFlag,"0");
+            SchoolGrade grade = schoolGrade.getOne(jb);
+            SchoolOrganizationSignin sos = new SchoolOrganizationSignin();
+            sos.setGrade(grade.getGradeName());
+            sos.setClasses(sc.getClassName());
+            sos.setName(ss.getStudentName());
+            String sex = ss.getSex();
+            if (StringUtils.equals(sex,"0")){
+                sos.setSex("男");
+            }else {
+                sos.setSex("女");
+            }
+            return AjaxResult.success(sos);
+        }
+        return AjaxResult.success(one);
     }
     }
 
 
     /**
     /**