From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 680615b..0e5d348 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -34,6 +34,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -197,7 +198,7 @@
examScore.setAllGrade(Math.round(theoryGrade / 2));
}
if (age>50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.3))));
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.5))));
}
//设置状态
if (theoryGrade>=60){
@@ -262,6 +263,8 @@
result = pre + (decimalFormat.format(count++));
}
user.setSecuritynumber(result);
+ //发证日期
+ user.setPaperTime(new Date());
//修改为持证保安
user.setHold("1");
//分配保安角色
@@ -276,6 +279,7 @@
"update blade_user set role_id = " + "'" + user.getRoleId() + "'" +
",hold = " + "'" + user.getHold() + "'" +
",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
+ ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
" " +"where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
@@ -288,8 +292,8 @@
examScore.setAllGrade(Math.round((examScore.getTheoryGrade()+examScoreExcel.getLearnGrade())/2));
}
if (user.getAge()>50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.3)))
- + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.7))));
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.5)))
+ + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.5))));
}
//内网同步
@@ -308,7 +312,11 @@
}
@Override
- public List<Map<String, Object>> scoreStatistics() {
- return baseMapper.scoreStatistics();
+ public List<Map<String, Object>> scoreStatistics(String deptid,String jurisdiction) {
+ return baseMapper.scoreStatistics(deptid,jurisdiction);
+ }
+ @Override
+ public List<Map<String, Object>> scoreStatisticssc(String deptid,String jurisdiction) {
+ return baseMapper.scoreStatisticssc(deptid,jurisdiction);
}
}
--
Gitblit v1.9.3