From b74f8511ee18cb0556aec293a8431752d610fec5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 30 Sep 2021 17:03:25 +0800
Subject: [PATCH] 主要管理人员，出资人员，培训查询，考试流程修改
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 c2ec3d2..ff0cb57 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
@@ -30,6 +30,7 @@
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,22 +41,21 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import static org.springblade.common.constant.FtpConstant.*;
-
/**
* 考试报名服务实现类
* @author zhongrj
*/
@Service
-@AllArgsConstructor
public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, Apply> implements ApplyService {
+ @Autowired
+ private ExamPaperService examPaperService;
- private final ExamPaperService examPaperService;
+ @Autowired
+ private IUserService userService;
- private final IUserService userService;
-
- private final TrainingRegistrationService trainingRegistrationService;
+ @Autowired
+ private TrainingRegistrationService trainingRegistrationService;
/**
* 自定义分页数据
@@ -394,8 +394,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 +463,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){
@@ -471,11 +473,12 @@
trainingRegistration.setId(apply.getId());
//考试中
trainingRegistration.setIsExam(3);
+// trainingRegistration.setIsExam(1);
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