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

gongchunyi

5 天以前 cecd7580b5e629173bdb5b258f2676d16d580f72

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
@@ -12,16 +13,15 @@
import com.ruoyi.safe.dto.SafeTrainingDto;
import com.ruoyi.safe.mapper.SafeTrainingDetailsMapper;
import com.ruoyi.safe.mapper.SafeTrainingFileMapper;
import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.mapper.SafeTrainingMapper;
import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.pojo.SafeTrainingFile;
import com.ruoyi.safe.service.SafeTrainingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import jakarta.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
@@ -40,19 +40,18 @@
 * @since 2026-01-29 10:54:06
 */
@Service
@RequiredArgsConstructor
public class SafeTrainingServiceImpl extends ServiceImpl<SafeTrainingMapper, SafeTraining> implements SafeTrainingService {

    @Autowired
    private SafeTrainingMapper safeTrainingMapper;
    private final SafeTrainingMapper safeTrainingMapper;

    @Autowired
    private SafeTrainingFileMapper safeTrainingFileMapper;
    private final SafeTrainingFileMapper safeTrainingFileMapper;

    @Autowired
    private SafeTrainingDetailsMapper safeTrainingDetailsMapper;
    private final SafeTrainingDetailsMapper safeTrainingDetailsMapper;

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

@@ -86,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 {
@@ -103,6 +103,7 @@

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