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/DeviceBorrowServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceBorrowServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceBorrowServiceImpl.java
index a402359..05cdbd0 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceBorrowServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceBorrowServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
@@ -75,6 +76,21 @@
deviceLogMapper.insert(deviceLog);
} else {
DeviceBorrow borrow = deviceBorrowMapper.selectById(deviceBorrow.getId());
+ if (borrow == null) {
+ throw new ServiceException("鍗曟嵁涓嶅瓨鍦�");
+ }
+ if ("鍏抽棴".equals(borrow.getNowState())) {
+ throw new ServiceException("璇ユ祦绋嬪凡缁撴潫锛屼笉鑳藉啀鎿嶄綔");
+ }
+ String expectedUser = null;
+ if ("褰掕繕".equals(borrow.getNowState())) {
+ expectedUser = borrow.getNowUser();
+ } else if ("鍊熷嚭".equals(borrow.getNowState())) {
+ expectedUser = borrow.getSubmitOperationUser();
+ }
+ if (expectedUser != null && !expectedUser.isBlank() && !expectedUser.equals(user.getName())) {
+ throw new ServiceException("鎮ㄤ笉鏄綋鍓嶇幆鑺傝矗浠讳汉锛屾棤鏉冩搷浣�");
+ }
deviceBorrowMapper.updateById(deviceBorrow);
//閫氳繃鎴栬�呴┏鍥炲鍔犳祦绋嬭窡韪�
if (deviceBorrow.getNowState().equals("鍏抽棴")) {
--
Gitblit v1.9.3