From 0d0f9bf9cc37073d23889c4d8aa8bb5bd038c85f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 16 四月 2025 15:24:18 +0800
Subject: [PATCH] 耐丝配置文件修改
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index ce42d05..b8f2d71 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -710,7 +710,7 @@
BeanUtils.copyProperties(qualityMonitorDetailsEvaluate, qualityMonitorDetailsEvaluateDto);
// 鏍煎紡鍖栨椂闂�
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- qualityMonitorDetailsEvaluateDto.setRatifyTimeStr(qualityMonitorDetailsEvaluate.getRatifyTime().format(dateTimeFormatter));
+ qualityMonitorDetailsEvaluateDto.setRatifyTimeStr(qualityMonitorDetailsEvaluate.getRatifyTime() == null ? null : qualityMonitorDetailsEvaluate.getRatifyTime().format(dateTimeFormatter));
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/quality-monitor-evaluate.docx");
Configure configure = Configure.builder()
@@ -751,7 +751,9 @@
if (qualityMonitorDetailsId == null) {
throw new ErrorException("缂哄皯鐩戞帶璇︽儏id");
}
-
+ QualityMonitorDetails qualityMonitorDetails = qualityMonitorDetailsService.getOne(Wrappers.<QualityMonitorDetails>lambdaUpdate()
+ .eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId));
+ LocalDateTime now = LocalDateTime.now();
Integer userId =SecurityUtils.getUserId().intValue();
String urlString;
@@ -768,10 +770,13 @@
wordInsertUrl(new HashMap<String, Object>() {{
put("writeUrl", UserUtils.getFinalUserSignatureUrl(userId));
+ put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
}}, wordUrl + "/" + pathName.replace("/word", wordUrl));
+
qualityMonitorDetailsService.update(Wrappers.<QualityMonitorDetails>lambdaUpdate()
.eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId)
- .set(QualityMonitorDetails::getFinishReportUrl, pathName));
+ .set(QualityMonitorDetails::getFinishReportUrl, pathName)
+ .set(QualityMonitorDetails::getWriteTime, now));
return true;
} catch (Exception e) {
@@ -787,13 +792,14 @@
*/
@Override
public boolean ratifyFinishReport(QualityMonitorDetails qualityMonitorDetails) {
+ LocalDateTime now = LocalDateTime.now();
Integer userId =SecurityUtils.getUserId().intValue();
LambdaUpdateWrapper<QualityMonitorDetails> wrapper = Wrappers.<QualityMonitorDetails>lambdaUpdate()
.eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetails.getQualityMonitorDetailsId())
.set(QualityMonitorDetails::getRatifyUserId, userId)
.set(QualityMonitorDetails::getRatifyRemark, qualityMonitorDetails.getRatifyRemark())
.set(QualityMonitorDetails::getRatifyStatus, qualityMonitorDetails.getRatifyStatus())
- .set(QualityMonitorDetails::getRatifyTime, LocalDateTime.now());
+ .set(QualityMonitorDetails::getRatifyTime, now);
if (qualityMonitorDetails.getRatifyStatus().equals(0)) {
wrapper.set(QualityMonitorDetails::getFinishReportUrl, null);
}
@@ -804,6 +810,7 @@
if (StringUtils.isNotBlank(details.getFinishReportUrl())) {
wordInsertUrl(new HashMap<String, Object>() {{
put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(userId));
+ put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
}}, wordUrl + "/" + details.getFinishReportUrl().replace("/word", wordUrl));
}
return true;
--
Gitblit v1.9.3