From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询，新增导入电子样板触发审签流程，新增电子样板指派设备功能
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index 87be894..90a1463 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -22,10 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
/**
* @Description: TODO
@@ -122,6 +119,7 @@
pd.setStepId(workStep.getId());
workStepDepartmentList.add(pd);
PermissionStreamNew perm = new PermissionStreamNew();
+ perm.setDepartId(item.getDepartId());
perm.setBusinessId(workStep.getId());
perm.setBusinessType("6");
permissionStreamList.add(perm);
@@ -137,16 +135,21 @@
ExceptionCast.cast(CommonCode.FAIL);
}
}
+ //娣诲姞鐢ㄦ埛鏉冮檺
+ b = productPermissionService.add(workStep.getId(), userId,"6");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
//娣诲姞缁撴瀯鏍�
ProductMix productMix = new ProductMix(Long.parseLong(workStep.getId()),Long.parseLong(workStep.getProcessId())
- ,workStep.getStepName(),workStep.getStepCode(),"6");
+ ,workStep.getStepName(),workStep.getStepCode(),6,new Date());
productMixService.save(productMix);
//娣诲姞鏉冮檺楠岃瘉
PermissionStreamNew permissionStream = new PermissionStreamNew();
permissionStream.setUserId(userId);
permissionStream.setBusinessId(workStep.getId());
permissionStream.setBusinessType("6");
- return permissionStreamNewService.save(permissionStream);
+ return permissionStreamNewService.addPermissionStreamNew(permissionStream);
}
/**
@@ -164,6 +167,11 @@
WorkStep en = super.getById(id);
if(en == null)
ExceptionCast.cast(ProcessInfoCode.WORKSTEP_NOT_EXIST);
+ //鍚屾淇敼缁撴瀯鏍�
+ ProductMix productMix = productMixService.getById(Long.parseLong(id));
+ productMix.setName(workStep.getStepName());
+ productMix.setCode(workStep.getStepCode());
+ productMixService.updateById(productMix);
return super.updateById(workStep);
}
--
Gitblit v1.9.3