From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增,报名查询,报名清册,培训报名,培训报名查询修改

---
 src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 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 9378c2c..a03c112 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
@@ -65,6 +65,11 @@
 	 */
 	@Override
 	public IPage<ApplyVO> selectApplyPage(IPage<ApplyVO> page, ApplyVO apply) {
+		if (null!=apply.getApplyStatus()){
+			if(apply.getApplyStatus()==3){
+				return page.setRecords(baseMapper.selectApplyPageStatis(page,apply));
+			}
+		}
 		return page.setRecords(baseMapper.selectApplyPage(page, apply));
 	}
 
@@ -394,8 +399,10 @@
 	 * @return
 	 */
 	@Override
-	public List<Long> getApplyIds() {
-		return baseMapper.getApplyIds();
+	public List<Apply> getApplyIds(ApplyVO applyVO) {
+		applyVO.setSerialStart(applyVO.getSerialStart() -1);
+		applyVO.setSerialEnd(applyVO.getSerialEnd() -applyVO.getSerialStart());
+		return baseMapper.getApplyIds(applyVO);
 	}
 
 	/**
@@ -461,9 +468,9 @@
 			apply1.setIsExam(3);
 			baseMapper.updateById(apply1);
 
-			String s1 =
-				"update sys_apply set is_exam = " + apply1.getIsExam() + " " +"where id = " + "'" + apply1.getId() + "'";
-			FtpUtil.sqlFileUpload(s1);
+//			String s1 =
+//				"update sys_apply set is_exam = " + apply1.getIsExam() + " " +"where id = " + "'" + apply1.getId() + "'";
+//			FtpUtil.sqlFileUpload(s1);
 		}
 		//模拟考
 		if (apply.getExamType()==2){
@@ -473,9 +480,9 @@
 			trainingRegistration.setIsExam(3);
 			trainingRegistrationService.updateById(trainingRegistration);
 
-			String s1 =
-				"update sys_training_registration set is_exam = " + trainingRegistration.getIsExam() + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
-			FtpUtil.sqlFileUpload(s1);
+//			String s1 =
+//				"update sys_training_registration set is_exam = " + trainingRegistration.getIsExam() + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
+//			FtpUtil.sqlFileUpload(s1);
 		}
 	}
 

--
Gitblit v1.9.3