From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
index b200894..8483407 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
@@ -8,7 +8,7 @@
import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.workflow.data.FlowInstanceInfo;
import com.vci.corba.workflow.data.MapTransfersInfo;
-import com.vci.corba.workflow.data.TasksAssignedInfo;
+import com.vci.corba.wf.data.TasksAssignedInfo;
import com.vci.dto.ProcessStartConfigDTO;
import com.vci.dto.ProcessTemplateVO;
import com.vci.dto.VciFileObjectDTO;
@@ -161,7 +161,7 @@
//鏌ヨ鏁版嵁鏄惁宸茬粡鍙戣捣浜嗘祦绋�
//鏌ヨinput杩炴帴閲屾槸涓嶆槸鏈夋祦绋嬪疄渚嬶紝骞朵笖娴佺▼瀹炰緥涓嶇瓑浜庣粓姝�
- conditionMap.put("oid", " in (select f_oid from platformlt_" + processDao.getTaskDataLink() + " where oid " + conditionMap.get("oid").replace("\\IN", " in ") + ")");
+ conditionMap.put("oid", " in (select f_oid from plt_" + processDao.getTaskDataLink() + " where oid " + conditionMap.get("oid").replace("\\IN", " in ") + ")");
List<BusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
if (workInstanceCbos != null && workInstanceCbos.size() > 0) {
for (BusinessObject workInstance : workInstanceCbos) {
@@ -178,7 +178,7 @@
BusinessObject cbo = allCbo.get(i);
String[] values = new String[4];
values[0] = cbo.oid;
- values[1] = cbo.revisionid;
+ values[1] = cbo.revoid;
values[2] = cbo.nameoid;
values[3] = cbo.btName;
objectPropertyValues[i] = values;
@@ -211,7 +211,7 @@
noticeInfo.setProcessTemplateVO(template);
BusAnnotationUtil.callForAnnotation(FlowNotifyWeb.class, FlowNotifyBefore.class,noticeInfo);
String processInstanceId = "";
- try {
+ /*try {
if (config.isAutoSubmitFirst()) {
processInstanceId = processDao.getWorkService().startProcessAndExecuteFirstNode(template.getOid(),
flowInstanceInfo,
@@ -226,7 +226,7 @@
objectPropertyValues);
}else{
processInstanceId = processDao.getWorkService().startPocessByPLMv1(
- /**
+ *//**
* String processDefinitionKey, 娴佺▼妯℃澘涓婚敭
* FlowInstanceInfo flowInstanceInfo, 娴佺▼瀹炰緥
* String[] objId, 鏁版嵁瀵硅薄id
@@ -238,7 +238,7 @@
* MapTransfersInfo[] mapTransfersInfos, 绉讳氦Info
* String[] objectProperty, 涓氬姟灞炴��
* String[][] objectPropertyValues 涓氬姟灞炴�у��
- */
+ *//*
template.getOid(),
flowInstanceInfo,
objIds,
@@ -254,7 +254,7 @@
}
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
- }
+ }*/
if (StringUtils.isNotBlank(config.getStartStatus())) {
try {
lifeCycleService.transCboStatus(allCbo, config.getStartStatus());
@@ -505,7 +505,7 @@
throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[0], e);
}
callBefore(workitemList,outCome,note,currentTime);
- try {
+ /*try {
if (jbpmTaskIds.length == 1) {
processDao.getWorkService().completeTaskByPlatformv1(jbpmTaskIds[0], outCome, nextTaskName, note, getUserEntityInfo(), nextTaskUsers, objectPropertyKeys, objectPropertyValues);
} else {
@@ -513,7 +513,7 @@
}
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
- }
+ }*/
callAfter((String)workitemList.get(0).get("executionid"),null,workitemList,currentTime);
}
@@ -541,7 +541,7 @@
for (String taskOid : taskOidArray) {
if (StringUtils.isNotBlank(taskOid)) {
try {
- processDao.getWorkService().transmitTask(taskOid, "user:" + userIds, getUserEntityInfo());
+ processDao.getWFService().transmitTask(taskOid, "user:" + userIds);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
--
Gitblit v1.9.3