From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 7d77491..4f7ca0a 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -121,7 +121,7 @@
/**
- * 点击了开始考试后超过60分钟后再考试的，计算之前的考试成绩
+ * 点击了开始考试后超过90分钟后再考试的，计算之前的考试成绩
*
* @param examScore 考试成绩信息对象
*/
@@ -176,7 +176,7 @@
//再根据身份证号查询用户,方式用户考了试，被删除，又新建的情况,修改最新用户的状态信息
User user1 = userService.getUserInfoByIdCardNo(user.getCardid());
//考试合格
- if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
+ if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade()== 0) {
//合格
examScore.setQualified(0);
//设置为未制证的状态
@@ -192,10 +192,10 @@
int max = userService.getSecurityPaperCount(pre);
String result = null;
if (max == 0) {
- result = pre + "00001";
+ result = pre + "000001";
} else {
//格式化
- DecimalFormat decimalFormat = new DecimalFormat("00000");
+ DecimalFormat decimalFormat = new DecimalFormat("000000");
max++;
result = pre + (decimalFormat.format(max));
}
@@ -215,6 +215,7 @@
securityPaperService.save(securityPaper);
//修改为持证保安
user1.setHold("1");
+ user1.setUpdateTime(new Date());
//更新保安数据
boolean b = userService.updateById(user1);
if (b) {
@@ -223,30 +224,14 @@
"update blade_user set hold = " + "'" + user1.getHold() + "'" +
",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
",user_type = " + "'" + user1.getUserType() + "'" +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user1.getUpdateTime()) + "'" +
" " + "where id = " + "'" + user1.getId() + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.dataSync(s1);
}
}
} else {
//不合格
examScore.setQualified(1);
- }
- //总成绩
- if (user.getAge() <= 50) {
- if (null != examScore1.getTheoryGrade()) {
- examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
- } else {
- examScore.setAllGrade(Math.round(examScore.getLearnGrade() / 2));
- }
- }
- if (user.getAge() > 50) {
- if (null != examScore1.getTheoryGrade()) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade() * 0.5)))
- + Integer.parseInt(String.valueOf(Math.round(examScore.getLearnGrade() * 0.5))));
- } else {
- examScore.setAllGrade(Math.round(examScore.getLearnGrade() / 2));
- }
}
}
//内网同步
@@ -345,7 +330,7 @@
examScoreExcel.setName("张三");
examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
// examScoreExcel.setCandidateNo("2110**m0001");
- examScoreExcel.setLearnGrade(80);
+ examScoreExcel.setLearnGrade("合格");
list.add(examScoreExcel);
ExamScoreExcel examScoreExcel1 = new ExamScoreExcel();
@@ -353,7 +338,7 @@
examScoreExcel1.setName("李四");
examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
// examScoreExcel1.setCandidateNo("2110**m0002");
- examScoreExcel1.setLearnGrade(88);
+ examScoreExcel1.setLearnGrade("不合格");
list.add(examScoreExcel1);
// ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
String fileName = null;
--
Gitblit v1.9.3