Merge remote-tracking branch 'origin/dev' into dev

dev
zhaokai 2026-03-10 14:15:13 +08:00
commit 067d9ebf3f
2 changed files with 2 additions and 1 deletions

View File

@ -312,7 +312,7 @@ public class ArchivesQueryExe {
// 新增档案下载记录
ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE();
archivesPdfFileE.init("student",personArchivesDTOList.get(0).getPhone() , 1, AuthContext.getTenantId(), personArchivesDTOList.get(0).getName()+"-");
archivesPdfFileE.init("student",personArchivesDTOList.get(0).getPhone() , 1, AuthContext.getTenantId(), personArchivesDTOList.get(0).getName()+"-"+DateUtil.getSdfTimes()+"-一人一档");
ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO();
BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO);
archivesPdfFileRepository.save(archivesPdfFileDO);

View File

@ -45,6 +45,7 @@ public class StudentExamRecordAddExe {
private final TrainingUserRepository trainingUserRepository;
@Transactional(rollbackFor = Exception.class)
public SingleResponse<StudentExamRecordCO> execute(StudentExamRecordAddCmd cmd) {
System.out.println("StudentExamRecordAddCmd"+ cmd.toString());
ClassDO classDO = classRepository.getByClassId(cmd.getClassId());
Integer count = studentExamRecordRepository.countByStudentId(cmd.getStudentId());
if (count >= classDO.getNumberofexams()) {