From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改
---
src/main/java/org/springblade/modules/member/controller/MemberController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index ab49cae..19de794 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -16,23 +16,24 @@
*/
package org.springblade.modules.member.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.common.utils.arg;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.member.entity.Member;
-import org.springblade.modules.member.vo.MemberVO;
import org.springblade.modules.member.service.IMemberService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.member.vo.MemberVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 控制器
@@ -87,7 +88,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
- public R save(@Valid @RequestBody Member member) {
+ public R save(@Valid @RequestBody Member member) throws Exception {
+ arg.test01(arg.url+"/member/save",member);
return R.status(memberService.save(member));
}
@@ -97,7 +99,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入member")
- public R update(@Valid @RequestBody Member member) {
+ public R update(@Valid @RequestBody Member member) throws Exception {
+ arg.test01(arg.url+"/member/update",member);
return R.status(memberService.updateById(member));
}
@@ -122,5 +125,15 @@
return R.status(memberService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 主要管理员信息
+ * @param creditcode
+ * @return
+ */
+ @PostMapping("/selectMemberInfo")
+ public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
+ IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
+ return R.data(pages);
+ }
}
--
Gitblit v1.9.3