gongchunyi
2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83
src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -67,7 +67,7 @@
    @Override
    public int addOrUpdate(SafeTraining safeTraining) {
        if (ObjectUtils.isNull(safeTraining.getId())) {
            String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
            String datePrefix ="KC-"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
            // 查询今日已存在的最大课程编号
            QueryWrapper<SafeTraining> queryWrapper = new QueryWrapper<>();
            queryWrapper.likeRight("course_code", datePrefix)
@@ -87,7 +87,7 @@
                }
            }
            // 生成完整的课程编号
            String no = "KC-" + String.format("%s%03d", datePrefix, sequenceNumber);
            String no = String.format("%s%03d", datePrefix, sequenceNumber);
            safeTraining.setCourseCode(no);
        }
        //根据时间判断培训状态
@@ -115,10 +115,14 @@
        SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
        //附件
        List<SafeTrainingFile> safeTrainingFiles = safeTrainingFileMapper.selectList(Wrappers.<SafeTrainingFile>lambdaQuery().eq(SafeTrainingFile::getSafeTrainingId, id));
        safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
        if (safeTrainingFiles.size()>0){
            safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
        }
        //培训记录详情
        List<SafeTrainingDetailsDto> safeTrainingDetailsDto = safeTrainingDetailsMapper.getSafeTraining(id);
        safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
        if (safeTrainingDetailsDto.size()>0) {
            safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
        }
        return safeTrainingDto;
    }