社团成员信息接口修改

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

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.organization;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,7 +20,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
+import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
+import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
 import yangtz.cs.liu.campus.vo.organization.MemberListVo;
 
 import java.util.Arrays;
@@ -38,6 +41,8 @@ public class SchoolOrganizationMemberController extends BaseController
     @Autowired
     private ISchoolOrganizationMemberService schoolOrganizationMemberService;
 
+    private ISchoolStudentParentService schoolStudentParentService;
+
     /**
      * 查询社团成员列表
      */
@@ -71,6 +76,11 @@ public class SchoolOrganizationMemberController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SchoolOrganizationMember schoolOrganizationMember)
     {
+        //新增社团成员的时候 要根据身份证号查询这个学生对应的userid
+        LambdaQueryWrapper<SchoolStudentParent> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SchoolStudentParent::getIdCard,schoolOrganizationMember.getCardid());
+        SchoolStudentParent one = schoolStudentParentService.getOne(wrapper);
+        schoolOrganizationMember.setUserId(one.getUserId());
         return toAjax(schoolOrganizationMemberService.save(schoolOrganizationMember));
     }
 

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

@@ -9,17 +9,21 @@ import com.ruoyi.framework.util.UserInfoUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin;
+import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationFcService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService;
 import yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoListVo;
+import yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoVo;
 import yangtz.cs.liu.wechat.vo.organization.WxOrganizationSigninVo;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @USER: liul   18266668098
@@ -40,6 +44,9 @@ public class WxSchoolOrganizationController extends BaseController {
     private ISchoolOrganizationMemberService schoolOrganizationMemberService;
 
     @Autowired
+    private ISchoolOrganizationFcService schoolOrganizationFcService;
+
+    @Autowired
     private UserInfoUtil userInfoUtil;
 
     /**
@@ -52,6 +59,7 @@ public class WxSchoolOrganizationController extends BaseController {
 //        String studentName = userInfoUtil.getMpLoginUser().getStudentName();
 //        String studentIdCard = userInfoUtil.getMpLoginUser().getStudentIdCard();
         Long userId = userInfoUtil.getMpLoginUser().getUserId();
+//        Long userId = 330L;
         LambdaQueryWrapper<SchoolOrganizationInfo> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(SchoolOrganizationInfo::getDelFlag,"0");
         wrapper.orderByDesc(SchoolOrganizationInfo::getCreateTime);
@@ -73,6 +81,22 @@ public class WxSchoolOrganizationController extends BaseController {
                 }else {
                     vo.setIsattend("2");
                 }
+
+                //根据社团id获取风采图片
+                LambdaQueryWrapper<SchoolOrganizationFc> wrapper3 = Wrappers.lambdaQuery();
+                wrapper3.eq(SchoolOrganizationFc::getCid,id)
+                        .eq(SchoolOrganizationFc::getIsfb,"1")
+                        .eq(SchoolOrganizationFc::getDelFlag,"0");
+                List<SchoolOrganizationFc> list1 = schoolOrganizationFcService.list(wrapper3);
+                ArrayList<String> str = new ArrayList<>();
+                if (list1!=null && list1.size()>0){
+                    for (int k = 0; k < list1.size(); k++) {
+                        String file = list1.get(k).getFile();
+                        str.add(file);
+                    }
+                    String imgs = str.stream().collect(Collectors.joining(","));
+                    vo.setImgs(imgs);
+                }
                 myList.add(vo);
             }
         }
@@ -85,7 +109,25 @@ public class WxSchoolOrganizationController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(schoolOrganizationInfoService.getById(id));
+        SchoolOrganizationInfo info = schoolOrganizationInfoService.getById(id);
+        SchoolOrganizationInfoVo vo = new SchoolOrganizationInfoVo();
+        BeanUtils.copyProperties(info,vo);
+        //根据社团id获取风采图片
+        LambdaQueryWrapper<SchoolOrganizationFc> wrapper3 = Wrappers.lambdaQuery();
+        wrapper3.eq(SchoolOrganizationFc::getCid,id)
+                .eq(SchoolOrganizationFc::getIsfb,"1")
+                .eq(SchoolOrganizationFc::getDelFlag,"0");
+        List<SchoolOrganizationFc> list1 = schoolOrganizationFcService.list(wrapper3);
+        ArrayList<String> str = new ArrayList<>();
+        if (list1!=null && list1.size()>0){
+            for (int k = 0; k < list1.size(); k++) {
+                String file = list1.get(k).getFile();
+                str.add(file);
+            }
+            String imgs = str.stream().collect(Collectors.joining(","));
+            vo.setImgs(imgs);
+        }
+        return AjaxResult.success(vo);
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/SchoolOrganizationInfoListVo.java

@@ -50,4 +50,7 @@ public class SchoolOrganizationInfoListVo {
 
     //是否参加  （1为已加入 2未加入）
     private String isattend;
+
+    /** 社团风采图片 */
+    private String imgs;
 }

smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/SchoolOrganizationInfoVo.java

 package yangtz.cs.liu.wechat.vo.organization;
 
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 
 /**
@@ -9,5 +10,28 @@ import lombok.Data;
  */
 @Data
 public class SchoolOrganizationInfoVo {
+    /** 社团名称 */
+    @Excel(name = "社团名称")
+    private String name;
 
+    /** 指导老师 */
+    @Excel(name = "指导老师")
+    private String teachers;
+
+    /** 指导老师id */
+    @Excel(name = "指导老师id")
+    private String teachersId;
+
+    /** 社团宗旨 */
+    @Excel(name = "社团宗旨")
+    private String aim;
+
+    /** 社团简介 */
+    @Excel(name = "社团简介")
+    private String intro;
+
+    /** 成员人数 */
+    private String num;
+
+    private String imgs;
 }