报名考试，成绩计算接口修改

Administrator

2021-08-11 30ec3bd40d36ed424dfda162752e08fae074f375

 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java

@@ -14,12 +14,17 @@
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExamScoreImporter;
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;

/**
 * @author zhongrj
@@ -32,6 +37,8 @@
public class ExamScoreController {

   private final ExamScoreService examScoreService;

   private final IUserService userService;

   /**
    * 自定义分页
@@ -90,13 +97,33 @@
   @PostMapping("/updateExamScore")
   public R updateExamScore(@RequestBody ExamScore examScore) throws Exception {
      if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
         ExamScore examScore1 = examScoreService.getById(examScore.getId());
         if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
            //合格
            examScore.setQualified(0);
            //去生成保安证编号
            //查询当前保安信息
            User user = userService.getById(examScore1.getUserId());
            String pre = SecurityPaperUtil.getSecurityPaper();
            //查询当前年份已有的保安证编号
            int count = userService.getSecurityPaperCount(pre);
            String result = null;
            if (count==0){
               result = pre + "00000";
            }else {
               //格式化
               DecimalFormat decimalFormat = new DecimalFormat("00000");
               result = pre + (decimalFormat.format(count++));
            }
            user.setSecuritynumber(result);
            //更新保安数据
            userService.updateById(user);
         }else {
            //不合格
            examScore.setQualified(1);
         }
         //总成绩
         examScore.setAllGrade(Math.round((examScore.getLearnGrade()+examScore1.getTheoryGrade())/2));
      }
      //内网修改
      //arg.test01(arg.url+"/examScore/update",examScore);