温湿度报检功能调整

zhuo

2025-04-10 1b0b86833609f1d0a25b0bc84d21796581629f4e

 cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
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.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
@@ -18,6 +20,7 @@
import com.ruoyi.require.service.FeTempHumDateService;
import com.ruoyi.require.service.FeTempHumRecordService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -46,6 +49,8 @@

    @Resource
    private FeTempHumRecordService feTempHumRecordService;
    @Value("${file.path}")
    private String imgUrl;

    @Override
    public IPage<FeTempHumDateDto> getFeTempHumDate(Page page, FeTempHumDateDto feTempHumDateDto) {
@@ -80,6 +85,10 @@
                BeanUtils.copyProperties(recordDtos.get(0), recordDto, "month");
                recordDto.setMorningTestTimeStr(recordDto.getMorningTestTime() == null ? null : recordDto.getMorningTestTime().format(formatter));
                recordDto.setAfternoonTimeStr(recordDto.getAfternoonTime() == null ? null : recordDto.getAfternoonTime().format(formatter));
                recordDto.setMorningRecorderUrlRender(StringUtils.isNotBlank(recordDto.getMorningRecorderUrl())
                        ? Pictures.ofLocal(imgUrl + "/" + recordDto.getMorningRecorderUrl()).create() : null);
                recordDto.setAfternoonRecorderUrlRender(StringUtils.isNotBlank(recordDto.getAfternoonRecorderUrl())
                        ? Pictures.ofLocal(imgUrl + "/" + recordDto.getAfternoonRecorderUrl()).create() : null);
            }

        }
@@ -128,19 +137,7 @@
        // 温湿度确认
        this.update(Wrappers.<FeTempHumDate>lambdaUpdate()
                .eq(FeTempHumDate::getDateId, feTempHumDate.getDateId())
                .set(FeTempHumDate::getSubjoin, feTempHumDate.getSubjoin())
                .set(FeTempHumDate::getIsAffirm, 1));
                .set(FeTempHumDate::getRegistrarUserId, feTempHumDate.getRegistrarUserId()));

        // 温湿度记录添加记录员
        Integer userId = SecurityUtils.getUserId().intValue();
        feTempHumRecordService.update(Wrappers.<FeTempHumRecord>lambdaUpdate()
                .isNotNull(FeTempHumRecord::getMorningTestTime)
                .eq(FeTempHumRecord::getDateId, feTempHumDate.getDateId())
                .set(FeTempHumRecord::getMorningRecorderId, userId));

        feTempHumRecordService.update(Wrappers.<FeTempHumRecord>lambdaUpdate()
                .isNotNull(FeTempHumRecord::getAfternoonTime)
                .eq(FeTempHumRecord::getDateId, feTempHumDate.getDateId())
                .set(FeTempHumRecord::getAfternoonRecorderId, userId));
    }
}