fix: 安全培训考核签到修改

gongchunyi

5 天以前 cecd7580b5e629173bdb5b258f2676d16d580f72

 src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java

@@ -51,6 +51,7 @@

    @Override
    public IPage<SafeTrainingDto> pageSafeTraining(Page page, SafeTrainingDto safeTrainingDto) {
        safeTrainingMapper.refreshTrainingState();
        return safeTrainingMapper.pageSafeTraining(page, safeTrainingDto);
    }

@@ -84,10 +85,11 @@
        String trainingDate = safeTraining.getTrainingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        LocalDateTime openingTime = LocalDateTime.parse((trainingDate + safeTraining.getOpeningTime()), DateTimeFormatter.ofPattern("yyyy-MM-ddHH:mm:ss"));
        LocalDateTime endTime = LocalDateTime.parse((trainingDate + safeTraining.getEndTime()), DateTimeFormatter.ofPattern("yyyy-MM-ddHH:mm:ss"));
        if (LocalDateTime.now().isBefore(openingTime)) {
        LocalDateTime now = LocalDateTime.now();
        if (now.isBefore(openingTime)) {
            //未开始
            safeTraining.setState(0);
        } else if (LocalDateTime.now().isAfter(endTime)) {
        } else if (!now.isBefore(endTime)) {
            //已结束
            safeTraining.setState(2);
        } else {
@@ -101,6 +103,7 @@

    @Override
    public SafeTrainingDto getSafeTraining(Long id) {
        safeTrainingMapper.refreshTrainingState();
        //主表数据
        SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
        //附件