From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改

---
 src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index 16898f0..a702dba 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -361,13 +361,38 @@
 		//查询考试信息
 		ExamPaper paper = examPaperService.getById(apply.getExamId());
 		map.put("examName",paper.getExamName());
-		//查询已报名的总人数
-		int num = baseMapper.getApplyDeatailNum(paper.getId());
-		map.put("num",num);
-		//查询已报名的的人信息集合
-		List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
-		map.put("applyList",applyVOList);
+
+		int num = 0;
+		if (paper.getExamType()==1){
+			//查询已报名的总人数
+			num = baseMapper.getApplyDeatailNum(paper.getId());
+			map.put("num",num);
+			//查询已报名的的人信息集合
+			List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
+			map.put("applyList",applyVOList);
+		}
+
+		//模拟考试
+		if (paper.getExamType()==2){
+			//查询已报名的总人数
+			num = baseMapper.getTrainDeatailNum(paper.getId());
+			map.put("num",num);
+			//查询已报名的的人信息集合
+			List<ApplyVO> applyVOList = baseMapper.getTrainDetailList(paper.getId());
+			map.put("applyList",applyVOList);
+		}
+
 		//返回数据
 		return map;
 	}
+
+	/**
+	 * 查询保安员个人报名信息
+	 * @param apply 报名信息,包含userId
+	 * @return
+	 */
+	@Override
+	public ApplyVO getSecurityApplyDetail(ApplyVO apply) {
+		return baseMapper.getSecurityApplyDetail(apply);
+	}
 }

--
Gitblit v1.9.3