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的类型；检验保存/提交按页面模板校验，复核驳回按检验室删除复核人
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java
index 790f995..9e882f2 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.device.pojo.DeviceExaminePlanDetails;
import com.ruoyi.device.pojo.DeviceExamineRecord;
import com.ruoyi.device.pojo.DeviceExamineRecordDetail;
+import com.ruoyi.device.service.DeviceExaminePlanService;
import com.ruoyi.device.service.DeviceExamineRecordDetailService;
import com.ruoyi.device.service.DeviceExamineRecordService;
import com.ruoyi.framework.exception.ErrorException;
@@ -53,6 +54,8 @@
@Resource
private DeviceExamineRecordDetailService deviceExamineRecordDetailService;
+ @Resource
+ private DeviceExaminePlanService deviceExaminePlanService;
@Resource
private DeviceExaminePlanDetailsMapper deviceExaminePlanDetailsMapper;
@Resource
@@ -186,6 +189,10 @@
}
this.update(wrapper);
+ // 澶嶆牳閫氳繃鍚庯紝璁惧妗ｆ鐨勬渶杩�/涓嬫鏍告煡鏃ユ湡杩涘叆涓嬩竴杞�
+ if (dto.getReviewStatus() != null && dto.getReviewStatus() == 1) {
+ deviceExaminePlanService.updateDeviceExamineDate(dto.getPlanDetailsId());
+ }
return true;
}
@@ -199,6 +206,9 @@
public void exportReviewExamineRecordDetail(Integer planDetailsId, HttpServletResponse response) {
// 鏌ヨ澶嶆牳鏍告煡璁板綍
DeviceExamineRecordDto deviceExamineRecordDto = baseMapper.selectReviewExamineRecordDto(planDetailsId);
+ if (deviceExamineRecordDto == null) {
+ throw new ErrorException("璇ヨ鍒掓槑缁嗘殏鏃犳牳鏌ヨ褰曪紝璇峰厛褰曞叆鍚庡啀瀵煎嚭");
+ }
// 鏌ヨ澶嶆牳鏍告煡璁板綍璇︽儏
List<DeviceExamineRecordDetail> deviceExamineRecordDetailList = deviceExamineRecordDetailService.list(Wrappers.<DeviceExamineRecordDetail>lambdaQuery().eq(DeviceExamineRecordDetail::getRecordId, deviceExamineRecordDto.getRecordId()));
@@ -213,9 +223,9 @@
put("deviceExamineRecordDto", deviceExamineRecordDto);
put("deviceExamineRecordDetailList", deviceExamineRecordDetailList);
//鑾峰彇鏍告煡浜虹殑绛惧悕鍦板潃
- put("checkerUserUrl", UserUtils.getFinalUserSignatureUrl(deviceExamineRecordDto.getCheckerUserId()));
+ put("checkerUserUrl", UserUtils.getFinalUserSignatureOrTransparent(deviceExamineRecordDto.getCheckerUserId()));
//鑾峰彇瀹℃煡浜虹殑绛惧悕鍦板潃
- put("reviewUserUrl", UserUtils.getFinalUserSignatureUrl(deviceExamineRecordDto.getReviewUserId()));
+ put("reviewUserUrl", UserUtils.getFinalUserSignatureOrTransparent(deviceExamineRecordDto.getReviewUserId()));
}});
try {
--
Gitblit v1.9.3