From 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:57:28 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java index 5a20188..343efa5 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java @@ -1,9 +1,11 @@ package org.jeecg.modules.dnc.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.dnc.entity.*; -import org.jeecg.modules.dnc.ucenter.Department; +import org.jeecg.modules.dnc.entity.DocInfo; +import org.jeecg.modules.dnc.entity.WorkStep; +import org.jeecg.modules.dnc.request.TreeInfoRequest; import org.jeecg.modules.system.entity.MdcProduction; +import org.jeecg.modules.system.entity.SysUser; import java.util.Collection; import java.util.List; @@ -75,4 +77,49 @@ * @return */ boolean assignRemoveDepart(WorkStep workStep, Collection<MdcProduction> departmentList); + + /** + * 鍒犻櫎宸ユ淇℃伅 閫昏緫鍒犻櫎 + * @param id + * @return + */ + boolean deleteWorkStep(String id); + + /** + * 鍒嗛厤鐢ㄦ埛鏉冮檺 + * @param workStep + * @param userList + * @return + */ + boolean assignAddUser(WorkStep workStep, Collection<SysUser> userList); + + /** + * 绉婚櫎鐢ㄦ埛鏉冮檺 + * @param workStep + * @param userList + * @return + */ + boolean assignRemoveUser(WorkStep workStep, Collection<SysUser> userList); + + + /** + * 閫氳繃宸ユ鍙枫�佸伐姝ュ悕绉扮瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘 + * NC鏂囦欢瀛樺湪璁惧绫讳笅闈� + * @param treeInfoRequest + * @return + */ + List<DocInfo> getByWorkStepOtherFile(TreeInfoRequest treeInfoRequest); + + /** + * 閫氳繃宸ユ鍙枫�佸伐姝ュ悕绉扮瓑鏌ヨ瀵瑰簲NC鏂囦欢 + * NC鏂囦欢瀛樺湪璁惧绫讳笅闈� + * @param treeInfoRequest + * @return + */ + List<DocInfo> getByWorkStepNCFile(TreeInfoRequest treeInfoRequest); + + + boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd); + + boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd); } -- Gitblit v1.9.3