系统合并

zhuo

2025-04-23 234b0ac195934b34c06045b2d2ef0f10e239dd8e

 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;

@@ -38,7 +41,7 @@
 * 设施和环境条件-设施和环境条件要求-温湿度 区域 -父 服务实现类
 * </p>
 *
 * @author 芯导软件（江苏）有限公司
 * @author
 * @since 2024-11-09 11:02:18
 */
@Service
@@ -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,14 +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()
                .eq(FeTempHumRecord::getDateId, feTempHumDate.getDateId())
                .set(FeTempHumRecord::getAfternoonRecorderId, userId)
                .set(FeTempHumRecord::getMorningRecorderId, userId));
    }
}