1. 定时任务调整 2. 成绩修改审核通过修改状态调整 3. 考试统计查询修改

Administrator

2022-01-20 cb04ed62736efe70cf5babe534220b4ae4c1ca67

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

@@ -25,6 +25,9 @@
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.UpdateParamVo;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
@@ -55,7 +58,7 @@

   private final ExamPaperService examPaperService;

   private final IRoleService roleService;
   private final SecurityPaperService securityPaperService;

   /**
    * 自定义分页
@@ -106,8 +109,17 @@
    */
   @PostMapping("/saveExamScore")
   public R saveExamScore(@RequestBody ExamScoreVO examScore) {

      return R.status(examScoreService.saveExamScore(examScore));
   }


   /**
    * 点击了开始考试后超过60分钟后再考试的，计算之前的考试成绩
    * @param examScore 考试成绩信息对象
    */
   @GetMapping("/getExamScore")
   public R getExamScore(ExamScoreVO examScore) {
      return R.status(examScoreService.getExamScore(examScore));
   }


@@ -178,23 +190,44 @@
                  result = pre + (decimalFormat.format(max));
               }
               user1.setSecuritynumber(result);
               //发证日期
//               user1.setPaperTime(new Date());

               //生成保安证的同时向保安证管理表中插入一条数据
               SecurityPaper securityPaper = new SecurityPaper();
               securityPaper.setUserId(user1.getId());
               securityPaper.setNumber(result);
               securityPaper.setCreateTime(new Date());
               securityPaper.setIdCardNo(user.getCardid());
               securityPaper.setPeopleName(user1.getRealName());
               securityPaper.setExamId(Long.parseLong(examScore1.getExamId()));
               securityPaper.setApplyId(examScore1.getApplyId());
               //新增保安员证信息
               securityPaperService.save(securityPaper);
               //修改为持证保安
               user1.setHold("1");
               //分配保安角色
//               Role role = new Role();
//               role.setRoleAlias("保安");
//               Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//               user.setRoleId(oneRole.getId().toString());
               //更新保安数据
               userService.updateById(user1);

               //数据同步
               String s1 =
                  "update blade_user set hold = " + "'" + user1.getHold() + "'" +
                     ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
                     ",user_type = " + "'" + user1.getUserType() + "'" +
                     " " + "where id = " + "'" + user1.getId() + "'";

//               String s1 =
//                  "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id) " +
//                     "values(" + "'" + securityPaper.getId() + "'"
//                     + "," + "'" + securityPaper.getNumber() +"'"
//                     + "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(securityPaper.getCreateTime()) +"'"
//                     + "," + "'" + securityPaper.getPeopleName() + "'"
//                     + "," + "'" + securityPaper.getIdCardNo() + "'"
//                     + "," + "'" + securityPaper.getUserId() + "'"
//                     + "," + "'" + securityPaper.getApplyId() + "'"
//                     + "," +"'" + securityPaper.getExamId() + "'" + ");" +
//                  "update blade_user set hold = " + "'" + user1.getHold() + "'" +
//                     ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
//                     ",user_type = " + "'" + user1.getUserType() + "'" +
//                     " " + "where id = " + "'" + user1.getId() + "'";
               FtpUtil.sqlFileUpload(s1);
            }
         } else {
@@ -311,7 +344,7 @@
      examScoreExcel.setExamName("2021年10月**日保安员证培训考试");
      examScoreExcel.setName("张三");
      examScoreExcel.setIdCardNo("360XXX19XXXXXX****");
      examScoreExcel.setCandidateNo("2110**m0001");
//      examScoreExcel.setCandidateNo("2110**m0001");
      examScoreExcel.setLearnGrade(80);
      list.add(examScoreExcel);

@@ -319,7 +352,7 @@
      examScoreExcel1.setExamName("2021年10月**日保安员证培训考试");
      examScoreExcel1.setName("李四");
      examScoreExcel1.setIdCardNo("360XXX19XXXXXX****");
      examScoreExcel1.setCandidateNo("2110**m0002");
//      examScoreExcel1.setCandidateNo("2110**m0002");
      examScoreExcel1.setLearnGrade(88);
      list.add(examScoreExcel1);
//      ExcelUtil.export(response, "实操成绩数据模板", "实操成绩数据表", list, ExamScoreExcel.class);
@@ -386,8 +419,8 @@
    * @param query     page,size
    */
   @GetMapping("/score-page")
   public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) {
      IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
   public R<IPage<ExamScoreVO>> scorePage(Query query,ExamScoreVO examScore) {
      IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),examScore);
      return R.data(pages);
   }

@@ -421,7 +454,7 @@
      //按条件查询成绩数据
      List<ExportExamScoreExcel> examScoreExcels = examScoreService.exportExamScoreList(examScoreVO);
      //导出成绩集合数据
      ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
      ExcelUtil.export(response, "成绩数据"+DateUtil.time(), "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
   }

   /**
@@ -432,4 +465,25 @@
   public R refreshTrainExamScore() {
      return R.status(examScoreService.refreshTrainExamScore());
   }

   /**
    * 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
    * @param
    */
   @GetMapping("/getExamStatisInfo")
   public R getExamStatisInfo(InformationVO information) {
      return R.data(examScoreService.getExamStatisInfo(information));
   }

   /**
    * 获取当前时间
    * @param
    */
   @GetMapping("/getNowDate")
   public R getNowDate() {
      return R.data(System.currentTimeMillis());
   }



}