智慧保安后台管理-外网
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
@@ -248,9 +249,19 @@
         examScoreExcelList.forEach(examScoreExcel -> {
            if (null!=examScoreExcel.getLearnGrade() && null!=examScoreExcel.getIdCardNo() && examScoreExcel.getIdCardNo()!=""){
               //使用考试名称匹配考试信息
               ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
//               ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
               //查询出成绩数据
               ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
//               ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
               //根据身份证号查询用户
               User user0 = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
               if (null==user0){
                  throw new ServiceException("用户:["+examScoreExcel.getIdCardNo()+"]不存在");
               }
               ExamScore examScore1 = new ExamScore();
               examScore1.setCandidateNo(examScoreExcel.getCandidateNo());
               examScore1.setUserId(user0.getId().toString());
               //根据准考证号和用户id查询考试成绩
               ExamScore examScore = this.getOne(Condition.getQueryWrapper(examScore1));
               if (null!=examScore) {
                  //查询当前保安信息
                  UserVO user = userService.getUserAgeById(Long.parseLong(examScore.getUserId()));
@@ -259,7 +270,7 @@
                     //合格
                     examScore.setQualified(0);
                     //正式考试通过生成保安证编号
                     if (examPaper.getExamType()==1) {
//                     if (examPaper.getExamType()==1) {
                        //去生成保安证编号
                        String pre = SecurityPaperUtil.getSecurityPaper();
                        //查询当前年份已有的保安证编号
@@ -292,7 +303,7 @@
                              ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                              " " +"where id = " + "'" + user.getId() + "'";
                        FtpUtil.sqlFileUpload(s1);
                     }
//                     }
                  } else {
                     //不合格
                     examScore.setQualified(1);