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/desk/controller/NoticeController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
index e49dd9b..8b42da3 100644
--- a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
@@ -21,6 +21,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiSort;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Condition;
@@ -32,6 +33,8 @@
import org.springblade.modules.desk.service.INoticeService;
import org.springblade.modules.desk.vo.NoticeVO;
import org.springblade.modules.desk.wrapper.NoticeWrapper;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -51,6 +54,8 @@
public class NoticeController extends BladeController {
private final INoticeService noticeService;
+
+ private final IDeptService iDeptService;
/**
* 详情
@@ -89,6 +94,13 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入notice")
public R<IPage<NoticeVO>> page(@ApiIgnore NoticeVO notice, Query query) {
+ //通过deptId获取组织机构信息
+ Dept dept = iDeptService.getById(notice.getDeptId());
+// if (dept.getDeptCategory() == 1) {
+// notice.setCategory(1);
+// } else {
+// notice.setCategory(2);
+// }
IPage<NoticeVO> pages = noticeService.selectNoticePage(Condition.getPage(query), notice);
return R.data(pages);
}
@@ -119,7 +131,9 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入notice")
- public R submit(@RequestBody Notice notice) {
+ public R submit(@RequestBody Notice notice) throws Exception {
+ //调用内网
+ arg.test01(arg.url+"/blade-desk/notice/submit",notice);
return R.status(noticeService.saveOrUpdate(notice));
}
@@ -129,7 +143,9 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入notice")
- public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) throws Exception {
+ //调用内网
+// arg.test01(arg.url+"/blade-desk/notice/remove",ids);
boolean temp = noticeService.deleteLogic(Func.toLongList(ids));
return R.status(temp);
}
--
Gitblit v1.9.3