From 2f07589b54d56085af77b50d580890cd4130b444 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:19:53 +0800
Subject: [PATCH] 设备模块后端业务规则、计划接口与日期联动
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExternalApplyServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExternalApplyServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExternalApplyServiceImpl.java
index 394f24e..1cd1784 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExternalApplyServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExternalApplyServiceImpl.java
@@ -6,11 +6,13 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceExternalApplyMapper;
import com.ruoyi.device.pojo.DeviceExternalApply;
import com.ruoyi.device.service.DeviceExternalApplyService;
+import com.ruoyi.device.util.DeviceFlowPermissionUtils;
import com.ruoyi.inspect.util.UserUtils;
import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.BeanUtils;
@@ -59,6 +61,7 @@
DeviceExternalApply apply = new DeviceExternalApply();
// 褰撳墠鐧诲綍鐢ㄦ埛淇℃伅鍜岄儴闂�
User user = userMapper.selectById(SecurityUtils.getUserId().intValue());
+ checkFlowPermission(deviceExternalApply, user);
switch (deviceExternalApply.getFlowType()) {
case 0:
BeanUtils.copyProperties(deviceExternalApply, apply);
@@ -67,11 +70,6 @@
apply.setApplicantUserId(user.getId());
apply.setApplicantUser(user.getName());
apply.setApplicantDate(LocalDate.now());
-
- // 澶勭悊浜轰俊鎭�
- User departmentHeadUser = userMapper.selectById(deviceExternalApply.getDepartmentHeadUserId());
- apply.setApplicantUserId(departmentHeadUser.getId());
- apply.setApplicantUser(departmentHeadUser.getName());
baseMapper.insert(apply);
break;
@@ -115,6 +113,40 @@
return true;
}
+ private void checkFlowPermission(DeviceExternalApply deviceExternalApply, User user) {
+ Integer flowType = deviceExternalApply.getFlowType();
+ Integer externalApplyId = deviceExternalApply.getExternalApplyId();
+ if (flowType != null && flowType > 0) {
+ DeviceExternalApply existing = baseMapper.selectById(externalApplyId);
+ if (existing == null) {
+ throw new ServiceException("鍗曟嵁涓嶅瓨鍦�");
+ }
+ DeviceFlowPermissionUtils.checkFinished(existing.getIsFinish());
+ Integer expectedUserId;
+ switch (flowType) {
+ case 1:
+ expectedUserId = existing.getDepartmentHeadUserId();
+ break;
+ case 2:
+ expectedUserId = existing.getMeteringRoomUserId();
+ break;
+ case 3:
+ expectedUserId = existing.getApproverUserId();
+ break;
+ default:
+ expectedUserId = null;
+ break;
+ }
+ DeviceFlowPermissionUtils.checkResponsible(expectedUserId, user.getId());
+ } else if (externalApplyId != null) {
+ DeviceExternalApply existing = baseMapper.selectById(externalApplyId);
+ if (existing != null) {
+ DeviceFlowPermissionUtils.checkFinished(existing.getIsFinish());
+ DeviceFlowPermissionUtils.checkResponsible(existing.getApplicantUserId(), user.getId());
+ }
+ }
+ }
+
/**
* 瀵煎嚭鍒╃敤澶栭儴璁惧鐢宠
*
--
Gitblit v1.9.3