考试成绩导入接口修改，查询接口修改

Administrator

2021-07-29 92b71ac07ad4e0b7282135cad0919a4be4ec1efb

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

@@ -4,16 +4,20 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.exam.entity.ExamScore;
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.vo.ExamScoreVO;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

/**
@@ -85,7 +89,15 @@
   @PostMapping("/updateExamScore")
   public R updateExamScore(@RequestBody ExamScore examScore) {
      if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
         examScore.setAllGrade(examScore.getLearnGrade()+examScore.getTheoryGrade());
         if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
            //合格
            examScore.setQualified(0);
         }else {
            //不合格
            examScore.setQualified(1);
         }
//         int totalSocre = examScore.getLearnGrade()+examScore.getTheoryGrade();
//         examScore.setAllGrade(Math.round(totalSocre/2));
      }
      return R.status(examScoreService.updateById(examScore));
   }
@@ -121,4 +133,26 @@
      return R.data(detail);
   }

   /**
    * 导入实操成绩
    * @param isCovered 1 覆盖  0不覆盖
    * @return
    */
   @PostMapping("import-examScore")
   @ApiOperation(value = "导入实操成绩", notes = "传入excel")
   public R importExamScore(MultipartFile file, Integer isCovered) {
      ExamScoreImporter examScoreImporter = new ExamScoreImporter(examScoreService, false);
      ExcelUtil.save(file, examScoreImporter, ExamScoreExcel.class);
      return R.success("操作成功");
   }

   /**
    * 导出模板
    */
   @GetMapping("export-template")
   @ApiOperation(value = "导出模板")
   public void exportUser(HttpServletResponse response) {
      List<ExamScoreExcel> list = new ArrayList<>();
      ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
   }
}