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 | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 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 6c8b036..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));
}
@@ -105,7 +110,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importApply(List<ApplyExcel> data, Boolean isCovered) {
+ public void importApply(List<ApplyExcel> data, Boolean isCovered,Long examId) {
data.forEach(applyExcel -> {
//查询用户信息
User user = new User();
@@ -120,6 +125,12 @@
apply1.setIsExam(1);
apply1.setApplyTime(new Date());
apply1.setUserId(user1.getId());
+ if (null!=examId){
+ apply1.setExamId(examId);
+ //生成准考证号
+ apply1.setCandidateNo(getCandidateNo(apply1));
+ }
+
this.save(apply1);
//修改保安报名状态
user1.setIsApply(1);
@@ -127,9 +138,14 @@
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = apply1.getId();
- String s = "insert into sys_apply(id,user_id,apply_time,apply_status,is_exam) " +
- "values(" + "'" + id + "'" + "," + "'" + apply1.getUserId() + "'" + "," + "'" + formatStr +
- "'" + "," + "'" + apply1.getApplyStatus() + "'" + "," +"'" + apply1.getIsExam() + "'" + ");" +
+ String s = "insert into sys_apply(id,user_id,candidate_no,apply_time,apply_status,exam_id,is_exam) " +
+ "values(" + "'" + id + "'" + ","
+ + "'" + apply1.getUserId() + "'" + ","
+ + "'" + apply1.getCandidateNo() + "'" + ","
+ + "'" + formatStr +"'" + ","
+ + "'" + apply1.getApplyStatus() + "'" + ","
+ + "'" + examId + "'" + ","
+ +"'" + apply1.getIsExam() + "'" + ");" +
"update blade_user set is_apply = " + "'" + user1.getIsApply() + "'" +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s);
}else {
@@ -140,6 +156,11 @@
apply1.setIsExam(1);
apply1.setApplyTime(new Date());
apply1.setUserId(user1.getId());
+ if (null!=examId){
+ apply1.setExamId(examId);
+ //生成准考证号
+ apply1.setCandidateNo(getCandidateNo(apply1));
+ }
this.save(apply1);
//修改保安报名状态
user1.setIsApply(1);
@@ -148,9 +169,14 @@
//内网数据同步
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = apply1.getId();
- String s = "insert into sys_apply(id,user_id,apply_time,apply_status,is_exam) " +
- "values(" + "'" + id + "'" + "," + "'" + apply1.getUserId() + "'" + "," + "'" + formatStr +
- "'" + "," + "'" + apply1.getApplyStatus() + "'" + "," +"'" + apply1.getIsExam() + "'" + ");" +
+ String s = "insert into sys_apply(id,user_id,candidate_no,apply_time,apply_status,exam_id,is_exam) " +
+ "values(" + "'" + id + "'" + ","
+ + "'" + apply1.getUserId() + "'" + ","
+ + "'" + apply1.getCandidateNo() + "'" + ","
+ + "'" + formatStr +"'" + ","
+ + "'" + apply1.getApplyStatus() + "'" + ","
+ + "'" + examId + "'" + ","
+ +"'" + apply1.getIsExam() + "'" + ");" +
"update blade_user set is_apply = " + "'" + user1.getIsApply() + "'" +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s);
}
@@ -373,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);
}
/**
@@ -440,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){
@@ -452,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