From d336c430e5d22ade703ff12f3d523889eb3d75d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 十一月 2024 10:54:26 +0800
Subject: [PATCH] action管理 编辑 新增 分类禁用bug
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
index f0721d5..ca79668 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
@@ -1,13 +1,11 @@
package com.vci.web.service.impl;
import com.vci.corba.omd.data.LinkObject;
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.ProcessTemplateVO;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -15,11 +13,10 @@
import com.vci.starter.web.util.Md5;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.constant.FileTypeConstants;
-import com.vci.web.constant.WFVariablesKeyConstant;
+import com.vci.constant.FileTypeConstants;
+import com.vci.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
-import com.vci.web.model.WFProcessClassifyDO;
-import com.vci.web.pageModel.*;
+import com.vci.model.WFProcessClassifyDO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.util.PlatformClientUtil;
@@ -106,8 +103,8 @@
* @param showAll 鏄惁鏄剧ず鎵�鏈夌殑鐗堟湰
*/
@Override
- public List<ProcessTemplateVO> getMyTemplates(String type,String filterTemplate,
- boolean showAll) throws VciBaseException {
+ public List<ProcessTemplateVO> getMyTemplates(String type, String filterTemplate,
+ boolean showAll) throws VciBaseException {
//鐜板湪娌℃湁娣诲姞鐢ㄦ埛鐨勮繃婊�
return processDao.getTemplatesByType(type,filterTemplate,showAll);
}
@@ -238,7 +235,6 @@
List<ProcessUserVO> pul = copyUsersToProcessNode(users,maxSecret);
if(isHasCurrentUser){//褰撳墠鐢ㄦ埛鏀惧湪鍓嶉潰
ProcessUserVO pu = new ProcessUserVO();
- //SessionInfo si = WebUtil.getSessionInfo(request);
SessionInfo si = WebUtil.getCurrentUserSessionInfo();
pu.setOid(si.getUserOid());
pu.setId(si.getUserId());
@@ -305,12 +301,24 @@
ProcessNodeVO pn = processDao.getNodePresideUsers(processTemplateOid, nodeName);
return getProcessUsersByNode(pn,-1);
}
-
+
+ /**
+ * 鑾峰彇閮ㄧ讲id
+ * @param executionId 鎵ц涓婚敭
+ * @return
+ * @throws VciBaseException
+ */
@Override
public String getDeployIdByExecutionId(String executionId) throws VciBaseException {
return processDao.getJbpmDeploymentIdByExecutionId(executionId);
}
-
+
+ /**
+ * 鑾峰彇浠诲姟涓缃殑褰撳墠澶勭悊浜�
+ * @param taskOid 浠诲姟涓婚敭
+ * @return
+ * @throws VciBaseException
+ */
@Override
public List<ProcessUserVO> getProcessUserByTask(String taskOid) throws VciBaseException{
List<ProcessTaskVO> task = processDao.getTaskByOid(taskOid);
@@ -321,6 +329,13 @@
}
}
+ /**
+ * 鑾峰彇鎴戠殑寰呭姙浜嬮」--骞冲彴涓嶆敮鎸佹煡璇㈡暟鎹�绘潯鏁帮紝涓嶆竻妤氬湪杩欑鎯呭喌涓嬶紝start鍜宲agesize鏄敤鏉ュ仛浠�涔堢敤鐨�
+ * @param conditionMap 鏉′欢鏌ヨ
+ * @param ph 鍒嗛〉鍜屾帓搴�
+ * @return
+ * @throws VciBaseException
+ */
@Override
public DataGrid getMyUndoProcessTask(
Map<String, String> conditionMap, PageHelper ph) throws VciBaseException {
@@ -330,6 +345,13 @@
return processDao.getUndoTask(conditionMap,ph,WebUtil.getCurrentUserId());
}
+ /**
+ * 鑾峰彇鎴戝鐞嗕簡鐨勪换鍔�
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param ph 鍒嗛〉淇℃伅
+ * @return
+ * @throws VciBaseException
+ */
@Override
public DataGrid getMyDoneProcessTask(Map<String, String> conditionMap,
PageHelper ph) throws VciBaseException {
--
Gitblit v1.9.3