Merge remote-tracking branch 'origin/master'

heheng

2025-12-03 430477c7e0777531f22fc18dc8906ea75cdc21d9

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExPaperStudentServiceImpl.java

@@ -1,6 +1,8 @@
package com.gkhy.exam.system.service.impl;

import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.common.api.CommonPage;
@@ -298,7 +300,7 @@
            }
            updateStudentAnswers.add(sa);
        }

        ExPaperStudent exPaperStudent = baseMapper.selectByPaperStudentId(paperStudent);
        studentAnswerService.saveOrUpdateBatch(updateStudentAnswers);
        paperStudent.setScore(totalScore);
        if(!easyViewFlag){
@@ -311,9 +313,13 @@
                //生成考试证书编号
                DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                String format = LocalDate.now().format(dateTimeFormatter);
                Long l = baseMapper.selectCount(Wrappers.<ExPaperStudent>lambdaQuery().eq(ExPaperStudent::getPassed, 1).eq(ExPaperStudent::getState,2));
                l+=1;
                paperStudent.setNumber("AQSC-"+format+"-"+l);
                String timestamp = String.valueOf(System.currentTimeMillis()).substring(9, 13);
                paperStudent.setNumber("AQSC-"+format+"-"+timestamp);
            }

            if (exPaperStudent.getScore()>=paperStudent.getScore()){
                paperStudent.setScore(exPaperStudent.getScore());
                paperStudent.setNumber(exPaperStudent.getNumber());
            }
        }
        int row=baseMapper.updateById(paperStudent);
@@ -325,14 +331,16 @@
    @Override
    @Transactional
    public void againExam(ExPaperStudent exPaperStudent) {
        baseMapper.deleteByPaperStudentId(exPaperStudent.getPaperId(),exPaperStudent.getStudentId());
        studentAnswerMapper.deletedByPaperStudentId(exPaperStudent.getPaperId(),exPaperStudent.getStudentId());
        BatchPaperStudentVO batchPaperStudentVO = new BatchPaperStudentVO();
        batchPaperStudentVO.setPaperId(exPaperStudent.getPaperId());
        List<Long> longs = new ArrayList<>();
        longs.add(exPaperStudent.getStudentId());
        batchPaperStudentVO.setStudentIds(longs);
        batchAddPaperStudent(batchPaperStudentVO);
//        baseMapper.deleteByPaperStudentId(exPaperStudent.getPaperId(),exPaperStudent.getStudentId());
//        studentAnswerMapper.deletedByPaperStudentId(exPaperStudent.getPaperId(),exPaperStudent.getStudentId());
//        BatchPaperStudentVO batchPaperStudentVO = new BatchPaperStudentVO();
//        batchPaperStudentVO.setPaperId(exPaperStudent.getPaperId());
//        List<Long> longs = new ArrayList<>();
//        longs.add(exPaperStudent.getStudentId());
//        batchPaperStudentVO.setStudentIds(longs);
//        batchAddPaperStudent(batchPaperStudentVO);
        baseMapper.updateByPaperStudentId(exPaperStudent);
        studentAnswerMapper.updateState(exPaperStudent);
    }

    private Integer getScore(ExExamPaper examPaper,Integer questionType){