From 1b0b86833609f1d0a25b0bc84d21796581629f4e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 10 四月 2025 13:07:21 +0800
Subject: [PATCH] 温湿度报检功能调整
---
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java
index 34959ac..35960b2 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumDateServiceImpl.java
+++ b/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));
}
}
--
Gitblit v1.9.3