成绩导出修改

zhongrj

2023-09-01 361a449fce9a44dc238e4417a1931d56c8972b70

成绩导出修改

 src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java

@@ -76,11 +76,11 @@

    @ColumnWidth(15)
    @ExcelProperty("实操成绩")
    private Integer learnGrade;
    private String learnGrade;

    @ColumnWidth(15)
    @ExcelProperty("总成绩")
    private Integer allGrade;
    @ExcelProperty("是否合格")
    private String qualified;

    @ColumnWidth(20)
    @ExcelProperty("保安员证编号")

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml

@@ -371,26 +371,19 @@
        bu.real_name securityName,bu.cardid idCardNo,bu.unit_name unitName,bu.securitynumber as securityNumber,
        bd.dept_name companyName,
        es.exam_time examTime,exam_end_time examEndTime,es.candidate_no candidateNo,
        es.theory_grade theoryGrade,es.learn_grade learnGrade,
        all_grade allGrade
         from
        exam_score es
        left join
        ksxt_exam ke
        on
        ke.id = es.exam_id
        left join
        blade_user bu
        on
        es.user_id = bu.id
        left join
        blade_dept bd
        on
        bd.id = bu.dept_id
        left join
        sys_training_registration str
        on
        str.id = es.apply_id
        es.theory_grade theoryGrade,
        case when es.learn_grade=0 then '合格'
            when es.learn_grade=1 then '不合格'
        end as learnGrade,
        case when es.qualified=0 then '合格'
            when es.qualified=1 then '不合格'
            when es.qualified=2 then '暂未录入实操成绩'
        end as qualified
        from exam_score es
        left join ksxt_exam ke on ke.id = es.exam_id
        left join blade_user bu on es.user_id = bu.id
        left join blade_dept bd on bd.id = bu.dept_id
        left join sys_training_registration str on str.id = es.apply_id
        left join sys_information si on si.departmentid = bd.id
        left join sys_jurisdiction sj on sj.id = si.jurisdiction
        where

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -56,14 +56,11 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -82,12 +79,10 @@
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -97,18 +92,12 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import static org.springblade.common.config.FtpConfig.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;

/**