Skip to content

D
dd_school
Commit 8cca9710 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 5c6539fd 3f3a96b4
Showing with 40 additions and 7 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
package yangtz.cs.liu.campus.controller.organization; package yangtz.cs.liu.campus.controller.organization;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -20,8 +21,15 @@ import com.ruoyi.common.enums.BusinessType; ...@@ -20,8 +21,15 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
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.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent; import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService; import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassRelationService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
import yangtz.cs.liu.campus.vo.organization.MemberListVo; import yangtz.cs.liu.campus.vo.organization.MemberListVo;
...@@ -44,6 +52,15 @@ public class SchoolOrganizationMemberController extends BaseController ...@@ -44,6 +52,15 @@ public class SchoolOrganizationMemberController extends BaseController
@Autowired @Autowired
private ISchoolStudentParentService schoolStudentParentService; private ISchoolStudentParentService schoolStudentParentService;
@Autowired
private ISchoolStudentClassesService schoolStudentClassesService;
@Autowired
private ISchoolStudentClassRelationService schoolStudentClassRelationService;
@Autowired
private ISchoolClassService schoolClassService;
/** /**
* 查询社团成员列表 * 查询社团成员列表
*/ */
...@@ -58,6 +75,21 @@ public class SchoolOrganizationMemberController extends BaseController ...@@ -58,6 +75,21 @@ public class SchoolOrganizationMemberController extends BaseController
.orderByDesc(SchoolOrganizationMember::getCreateTime); .orderByDesc(SchoolOrganizationMember::getCreateTime);
startPage(); startPage();
List<SchoolOrganizationMember> list = schoolOrganizationMemberService.list(wrapper); List<SchoolOrganizationMember> list = schoolOrganizationMemberService.list(wrapper);
//查询社团成员时 应根据当前这个学生 去动态查询那个班级
if (list!=null){
for (int i = 0; i < list.size(); i++) {
Long userId = list.get(i).getUserId();
LambdaQueryWrapper<SchoolStudentClassRelation> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(SchoolStudentClassRelation::getStudentId,userId);
SchoolStudentClassRelation one = schoolStudentClassRelationService.getOne(wrapper1);
LambdaQueryWrapper<SchoolClass> wrapper2 = Wrappers.lambdaQuery();
wrapper2.eq(SchoolClass::getId,one.getClassId());
SchoolClass res = schoolClassService.getOne(wrapper2);
list.get(i).setGrade(res.getGradeName());
list.get(i).setClasses(res.getClassName());
}
}
return getDataTable(list); return getDataTable(list);
} }
...@@ -82,7 +114,8 @@ public class SchoolOrganizationMemberController extends BaseController ...@@ -82,7 +114,8 @@ public class SchoolOrganizationMemberController extends BaseController
// wrapper.eq(SchoolStudentParent::getIdCard,schoolOrganizationMember.getCardid()); // wrapper.eq(SchoolStudentParent::getIdCard,schoolOrganizationMember.getCardid());
// SchoolStudentParent one = schoolStudentParentService.getOne(wrapper); // SchoolStudentParent one = schoolStudentParentService.getOne(wrapper);
// schoolOrganizationMember.setUserId(one.getUserId()); // schoolOrganizationMember.setUserId(one.getUserId());
return toAjax(schoolOrganizationMemberService.save(schoolOrganizationMember)); boolean save = schoolOrganizationMemberService.save(schoolOrganizationMember);
return toAjax(save);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java
...@@ -106,7 +106,8 @@ public class SchoolOrganizationSigninController extends BaseController ...@@ -106,7 +106,8 @@ public class SchoolOrganizationSigninController extends BaseController
boolean save = schoolOrganizationMemberService.save(member); boolean save = schoolOrganizationMemberService.save(member);
System.out.println(save); System.out.println(save);
} }
return toAjax(schoolOrganizationSigninService.updateById(so)); boolean b = schoolOrganizationSigninService.updateById(so);
return toAjax(b);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.domain.organization; ...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.domain.organization;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity; import com.core.domain.OurBaseEntity;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
...@@ -13,12 +14,11 @@ import com.ruoyi.common.annotation.Excel; ...@@ -13,12 +14,11 @@ import com.ruoyi.common.annotation.Excel;
* @date 2023-09-06 * @date 2023-09-06
*/ */
@Data @Data
public class SchoolOrganizationSignin extends OurBaseEntity public class SchoolOrganizationSignin extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id */
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
@Excel(name = "id")
private Long id; private Long id;
/** 姓名 */ /** 姓名 */
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java
...@@ -155,8 +155,7 @@ public class WxSchoolOrganizationController extends BaseController { ...@@ -155,8 +155,7 @@ public class WxSchoolOrganizationController extends BaseController {
//根据当前登录人 查询当前社团的报名状态 //根据当前登录人 查询当前社团的报名状态
LambdaQueryWrapper<SchoolOrganizationSignin> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<SchoolOrganizationSignin> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SchoolOrganizationSignin::getUserId,userId) wrapper.eq(SchoolOrganizationSignin::getUserId,userId)
.eq(SchoolOrganizationSignin::getCid,vo.getCid()) .eq(SchoolOrganizationSignin::getCid,vo.getCid());
.eq(SchoolOrganizationSignin::getDelFlag,"0");
SchoolOrganizationSignin one = schoolOrganizationSigninService.getOne(wrapper); SchoolOrganizationSignin one = schoolOrganizationSigninService.getOne(wrapper);
if (one==null){ if (one==null){
//根据studentId 获取当前登录人信息 返回给前端 //根据studentId 获取当前登录人信息 返回给前端
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment