From 6ab1565a1a86623af925719935d605e875d98af4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 23 十月 2026 18:08:56 +0800
Subject: [PATCH] 设备核查计划：设备档案变更即时登记计划明细，提前核查复用待核查明细并回写档案，已完成记录不可覆盖；新增附件字段、明细固定排序与删除保护；人员查询新增包含admin的类型；检验保存/提交按页面模板校验，复核驳回按检验室删除复核人
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index b5d0e0f..ed0e8e7 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -77,8 +77,8 @@
if (snapshot == null) {
throw new ErrorException("鏈壘鍒板綋鍓嶆ā鏉跨殑鍘熷璁板綍蹇収");
}
- boolean hasSnapshotField = dto.isTemperaturePresent() || dto.isHumidityPresent()
- || dto.isDetectionTimePresent() || dto.isDetectionPlacePresent()
+ boolean hasSnapshotField = dto.isTemperaturePresent() || dto.isDetectionTimePresent()
+ || dto.isDetectionPlacePresent()
|| dto.isInsResultPresent();
if (hasSnapshotField) {
insOrderStandardTemplateMapper.update(null,
@@ -86,8 +86,6 @@
.eq(InsOrderStandardTemplate::getId, snapshot.getId())
.set(dto.isTemperaturePresent(),
InsOrderStandardTemplate::getTemperature, dto.getTemperature())
- .set(dto.isHumidityPresent(),
- InsOrderStandardTemplate::getHumidity, dto.getHumidity())
.set(dto.isDetectionTimePresent(),
InsOrderStandardTemplate::getDetectionTime, dto.getDetectionTime())
.set(dto.isDetectionPlacePresent(),
@@ -96,6 +94,11 @@
InsOrderStandardTemplate::getInsResult, dto.getInsResult()));
}
if (dto.isDeviceIdsPresent()) {
+ // 鎵嬪姩閫夋嫨鎴栨竻绌洪兘瑙嗕负宸插垵濮嬪寲锛屽悗缁繘鍏ヤ换鍔′笉寰楀啀娆″鐢ㄦ爣鍑嗗簱榛樿鍊笺��
+ insOrderStandardTemplateMapper.update(null,
+ Wrappers.<InsOrderStandardTemplate>lambdaUpdate()
+ .eq(InsOrderStandardTemplate::getId, snapshot.getId())
+ .set(InsOrderStandardTemplate::getDeviceDefaultsInitialized, 1));
insOrderTemplateDeviceMapper.delete(
Wrappers.<InsOrderTemplateDevice>lambdaQuery()
.eq(InsOrderTemplateDevice::getInsOrderId, dto.getId())
--
Gitblit v1.9.3