From c9f44e0ef916dd8d84639fe86d001a440ca76474 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 20:13:38 +0800
Subject: [PATCH] 1.新增保安个人照片，准考证信息接口修改 2.新增导出清册接口
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 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 4ec1800..18da928 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
@@ -12,6 +12,7 @@
import org.springblade.common.utils.arg;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
+import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.apply.mapper.ApplyMapper;
import org.springblade.modules.apply.service.ApplyService;
import org.springblade.modules.apply.vo.ApplyPaPerVO;
@@ -246,12 +247,38 @@
*/
@Override
public ApplyPaPerVO getApplyInfo(Apply apply) {
- ApplyPaPerVO applyPaPerVO = baseMapper.getApplyInfo(apply);
+ //正式考试
+ if (apply.getApplyExamType()==1){
+ ApplyPaPerVO applyPaPerVO = baseMapper.getApplyInfo(apply);
+ String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
+ String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
+ String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
+ applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
+ return applyPaPerVO;
+ }
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
- String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
- String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
- applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
- return applyPaPerVO;
+ //模拟考试
+ if (apply.getApplyExamType()==2){
+ ApplyPaPerVO applyPaPerVO = baseMapper.getTrainApplyInfo(apply);
+ String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[0];
+ String startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getStartTime()).split(" ")[1];
+ String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(applyPaPerVO.getEndTime()).split(" ")[1];
+ applyPaPerVO.setStringTime(time+" "+startTime.substring(0,startTime.length()-3) +"-"+ endTime.substring(0,endTime.length()-3));
+ return applyPaPerVO;
+ }
+
+
+
+ return null;
+ }
+
+ /**
+ * 导出报名数数据
+ * @param apply 报名对象
+ * @return
+ */
+ @Override
+ public List<ApplyInfoExcel> getApplyExcelList(Apply apply) {
+ return baseMapper.getApplyExcelList(apply);
}
}
--
Gitblit v1.9.3