From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 二月 2025 14:55:56 +0800
Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index 6462d98..b6d842d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,6 +52,10 @@
private IPermissionStreamService permissionStreamService;
@Autowired
private IProcessionDepartmentService processionDepartmentService;
+ @Autowired
+ private IWorkStepService workStepService;
+ @Autowired
+ private IDocRelativeService iDocRelativeService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -166,18 +171,16 @@
ProcessStream en = super.getById(id);
if(en == null)
ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
- boolean b = docInfoService.deleteByProcessId(en.getProcessId());
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(4);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("宸ュ簭鍙凤細"+en.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
+ //楠岃瘉宸ュ簭涓嬫槸鍚︽湁宸ユ
+ List<WorkStep> workStepList=workStepService.list(new QueryWrapper<WorkStep>().eq("process_id",id));
+ if(workStepList != null && !workStepList.isEmpty()) {
+ ExceptionCast.cast(ProcessInfoCode.WORKSTEP_HAS_DATA);
+ }
+ //楠岃瘉鏄惁瀛樺湪鏂囨。
+ List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","5").eq("attribution_id",id));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_HAS_DOC);
+ }
return super.removeById(id);
}
--
Gitblit v1.9.3