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 +++++++++++----
cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml | 7 +++++++
ruoyi-admin/src/main/resources/application-ztns.yml | 10 +++++-----
cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java | 5 +++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 14 ++++++++------
5 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java
index 34f0243..d1ed051 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetails.java
@@ -49,6 +49,11 @@
@ApiModelProperty("瀹屾垚鎶ュ憡鍦板潃")
private String finishReportUrl;
+ @ApiModelProperty("瀹屾垚鎶ュ憡缂栧啓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime writeTime;
+
+
@ApiModelProperty("瀹屾垚鎶ュ憡鎵瑰噯浜�")
private Integer ratifyUserId;
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;
diff --git a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
index 0e80c86..aa500be 100644
--- a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
@@ -29,5 +29,12 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ order by quality_monitor_id, monitor_purpose, -- 鎻愬彇骞翠唤
+ CAST(SUBSTRING(planned_time, 1, 4) AS SIGNED) ASC,
+ -- 鎻愬彇鏈堜唤
+ CASE
+ WHEN planned_time LIKE '% - %' THEN 1
+ ELSE CAST(SUBSTRING_INDEX(SUBSTRING(planned_time, 6), '鏈�', 1) AS SIGNED)
+ END ASC
</select>
</mapper>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index bbce5a1..c6f3e6b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -499,13 +499,15 @@
}
}
- //鏌ヨ妫�楠屽崟淇℃伅
// 娣诲姞宸ユ椂
- InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
- threadPoolTaskExecutor.execute(() -> {
- InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
- this.addAuxiliary(userId, finalInsProduct, insOrder);
- });
+ // 鍒ゆ柇鏄惁鍙槸鍙備笌璁＄畻鍊�, 鍙備笌璁＄畻鍊煎疄闄呮病鏈夊～鍐�
+ if (StringUtils.isNotBlank(newResult.getInsValue()) && !newResult.getInsValue().equals("[]")) {
+ InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
+ threadPoolTaskExecutor.execute(() -> {
+ InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
+ this.addAuxiliary(userId, finalInsProduct, insOrder);
+ });
+ }
}
});
diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztns.yml
similarity index 93%
rename from ruoyi-admin/src/main/resources/application-ztzb.yml
rename to ruoyi-admin/src/main/resources/application-ztns.yml
index b49b460..5ce799e 100644
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ b/ruoyi-admin/src/main/resources/application-ztns.yml
@@ -130,14 +130,14 @@
# oa娴佺▼
oa:
- oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
- prodIp: http://192.168.21.53:8001/lims
- unqualifiedProcessId: 41974
+ oaHost:
+ prodIp:
+ unqualifiedProcessId:
# 浼佷笟寰俊鎺ㄩ��
wechat:
# 璐ㄩ噺鎶ユ閫氱煡
- examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=6e1d2d18-0c60-4889-a05f-b1b5479c9188
+ examiningUrl:
# 浜轰簨绯荤粺
personnel:
@@ -172,4 +172,4 @@
completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
clientId: javaPublish # clientId
subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚
- client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
--
Gitblit v1.9.3