部门数菜单修改，考试审核修改

Administrator

2021-11-12 5cceb01ea15fa807ebe0011c5b38780cb3e3e2c3

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

@@ -1,7 +1,6 @@
package org.springblade.modules.exam.controller;

import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -9,7 +8,6 @@
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -26,9 +24,7 @@
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.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.UserVO;
@@ -38,7 +34,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.sql.Array;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -161,11 +156,13 @@
         if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
            //合格
            examScore.setQualified(0);
            //设置为未制证的状态
            user1.setUserType(7);
            //正式考试通过生成保安证编号
            ExamPaper paper = examPaperService.getById(examScore.getExamId());
//            if (paper.getExamType() == 1) {
            //如果已有保安证编号，不更新用户信息
            if (null==user1.getSecuritynumber() || user1.getSecuritynumber()=="") {
            if (null==user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
               //去生成保安证编号
               String pre = SecurityPaperUtil.getSecurityPaper();
               //查询当前年份已有的保安证编号
@@ -181,7 +178,7 @@
               }
               user1.setSecuritynumber(result);
               //发证日期
               user1.setPaperTime(new Date());
//               user1.setPaperTime(new Date());
               //修改为持证保安
               user1.setHold("1");
               //分配保安角色
@@ -195,7 +192,7 @@
               String s1 =
                  "update blade_user set hold = " + "'" + user1.getHold() + "'" +
                     ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
                     ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user1.getPaperTime()) + "'" +
                     ",user_type = " + "'" + user1.getUserType() + "'" +
                     " " + "where id = " + "'" + user1.getId() + "'";
               FtpUtil.sqlFileUpload(s1);
            }
@@ -425,7 +422,6 @@
      //导出成绩集合数据
      ExcelUtil.export(response, "成绩数据", "成绩数据表", examScoreExcels, ExportExamScoreExcel.class);
   }


   /**
    * 考试成绩恢复状态重置（重考）