1. 实操成绩导入修改 2. 定时任务配置多线程执行 3. 保安员查询修改

Administrator

2021-12-14 6b110c93a1fb5392401e0674db0dd807ea82a12f

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -273,14 +273,14 @@
                     if (null!=examScore) {
                        //查询当前保安信息
                        UserVO user = userService.getUserAgeById(Long.parseLong(examScore.getUserId()));
                        //设置实操成绩
                        examScore.setLearnGrade(examScoreExcel.getLearnGrade());
                        if (null!=examScore.getTheoryGrade()){
                        if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
                           //合格
                           examScore.setQualified(0);
                           //修改制证状态为未制证
                           user.setUserType(7);
                           //正式考试通过生成保安证编号
//                     if (examPaper.getExamType()==1) {
                           //如果已有保安证编号，不更新用户信息
                           if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
                              //去生成保安证编号
@@ -297,8 +297,6 @@
                                 result = pre + (decimalFormat.format(count));
                              }
                              user.setSecuritynumber(result);
                              //发证日期
//                        user.setPaperTime(new Date());
                              //修改为持证保安
                              user.setHold("1");
                              user.setUpdateTime(new Date());
@@ -313,6 +311,7 @@
                                    " " + "where id = " + "'" + user.getId() + "'";
                              FtpUtil.sqlFileUpload(s1);
                           }
                           }
                        } else {
                           //不合格
                           examScore.setQualified(1);