From cc0e9036de6e922e8fe254fef01d8de9996024b7 Mon Sep 17 00:00:00 2001 From: hyingbo <1363390067@qq.com> Date: 星期四, 17 七月 2025 18:16:03 +0800 Subject: [PATCH] 获取报警描述修改 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java index 163ea8e..111febf 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java @@ -1,11 +1,10 @@ package org.jeecg.modules.dnc.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.dnc.entity.PartsInfo; +import org.jeecg.modules.dnc.entity.DocInfo; import org.jeecg.modules.dnc.entity.ProcessStream; -import org.jeecg.modules.dnc.entity.WorkStep; import org.jeecg.modules.dnc.request.ProcessStreamRequest; -import org.jeecg.modules.dnc.ucenter.Department; +import org.jeecg.modules.dnc.request.TreeInfoRequest; import org.jeecg.modules.system.entity.MdcProduction; import org.jeecg.modules.system.entity.SysUser; @@ -58,18 +57,18 @@ /** * 鑾峰彇闆朵欢鍏宠仈鐨勫伐搴忎俊鎭� - * @param partsId + * @param psvId * @return */ - List<ProcessStream> findByPartsId(String partsId); + List<ProcessStream> findBypsvId(String psvId); /** * 鑾峰彇闆朵欢涓嬬殑宸ュ簭鍙� * @param processNo - * @param partsId + * @param psvsId * @return */ - ProcessStream findByProcessNoAndPartsId(String processNo, String partsId); + ProcessStream findByProcessNoAndPartsId(String processNo, String psvsId); /** * 鑾峰彇閮ㄤ欢涓嬬殑宸ュ簭鍙� * @param processNo @@ -143,4 +142,23 @@ * @return */ boolean assignRemoveUser(ProcessStream processStream, Collection<SysUser> userList); + + /** + * 閫氳繃宸ュ簭鍙枫�佸伐搴忓悕绉扮瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘 + * @param treeInfoRequest + * @return + */ + List<DocInfo> getByProcessStreamOtherFile(TreeInfoRequest treeInfoRequest); + + /** + * 閫氳繃宸ュ簭鍙枫�佸伐搴忓悕绉扮瓑鏌ヨ瀵瑰簲NC鏂囦欢 + * NC鏂囦欢瀛樺湪璁惧绫讳笅闈� + * @param treeInfoRequest + * @return + */ + List<DocInfo> getByProcessStreamNCFile(TreeInfoRequest treeInfoRequest); + + boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd); + + boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd); } -- Gitblit v1.9.3