From cc44920da3d40b8248b67560026e891afdd1a6ab Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 08 五月 2025 17:57:14 +0800
Subject: [PATCH] 1.查询可以被引用的部件接口开发完成 2.借用部件(可批量) 开发完成 3.修改原有新增、修改部件接口 完成 4.修改原有删除文档与导入文档接口 完成 5.修改工作流问题
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 d4dd1eb..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
@@ -1,7 +1,5 @@
package org.jeecg.modules.dnc.service.impl;
-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;
@@ -11,7 +9,6 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
-import org.jeecg.modules.dnc.mapper.PartsInfoMapper;
import org.jeecg.modules.dnc.mapper.WorkStepMapper;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.ProcessInfoCode;
@@ -25,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
@@ -53,6 +47,9 @@
@Autowired
private IProductPermissionService productPermissionService;
+
+ @Autowired
+ private IProductMixService productMixService;
@Override
public List<WorkStep> getByUserPerms(String userId) {
@@ -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);
@@ -142,12 +140,16 @@
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,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);
}
/**
@@ -165,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);
}
@@ -293,6 +300,10 @@
if (!docRelativeList.isEmpty()){
ExceptionCast.cast(ProcessInfoCode.WORKSTEP_HAS_DOC);
}
+ boolean b=productMixService.removeById(id);
+ if(!b) {
+ ExceptionCast.cast(CommonCode.FAIL);
+ }
return super.removeById(id);
}
--
Gitblit v1.9.3