From 9e18636bed4fc3fceec08ca25d6c7916d4d9a429 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 25 十二月 2024 17:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
index e3b04b5..92cdb96 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
@@ -636,7 +636,7 @@
conditionMap.put("f_btwname", workitemBtmType);
}else if(StringUtils.isNotBlank(processOid)){
//瀹為檯涓婁紶閫掔殑鏄痚xecutionid
- conditionMap.put("f_oid", "\\IN(select oid from platformbtm_" + workIntanceBtmType + " where executionid = '" + processOid.trim() + "')");
+ conditionMap.put("f_oid", "\\IN(select oid from pbt_" + workIntanceBtmType + " where executionid = '" + processOid.trim() + "')");
conditionMap.put("f_btwname", workIntanceBtmType);
}
return getData(taskDataLink,conditionMap,referColumns);
@@ -656,7 +656,7 @@
conditionMap.put("f_oid", taskOid.trim());
conditionMap.put("f_btwname", getWorkitemBtmType());
}else if(StringUtils.isNotBlank(executionid)){
- conditionMap.put("f_oid", "\\IN(select oid from platformbtm_" + getWorkIntanceBtmType() + " where executionid = '" + executionid.trim() + "')");
+ conditionMap.put("f_oid", "\\IN(select oid from pbt_" + getWorkIntanceBtmType() + " where executionid = '" + executionid.trim() + "')");
conditionMap.put("f_btwname", getWorkIntanceBtmType());
}
return loService.queryCLO(taskDataLink, conditionMap);
@@ -708,7 +708,7 @@
public DataGrid getDataByProcess(String executionId,String referColumns) throws VciBaseException{
WebUtil.alertNotNull(executionId,"娴佺▼鎵цID");
Map<String,String> conditionMap = new HashMap<String, String>();
- conditionMap.put("f_oid","\\IN(select oid from platformbtm_" +getWorkIntanceBtmType() + " where executionid='" + executionId.trim() + "')");
+ conditionMap.put("f_oid","\\IN(select oid from pbt_" +getWorkIntanceBtmType() + " where executionid='" + executionId.trim() + "')");
conditionMap.put("f_btwname", getWorkIntanceBtmType());
return getData(processDataLink,conditionMap,referColumns);
}
@@ -1016,7 +1016,7 @@
@Override
public List<ProcessInstanceVO> listExecutingProcessByBussinessOid(String bussinessOid, String btmName) throws VciBaseException {
Map<String,String> conditionMap = new HashMap<String, String>();
- conditionMap.put("oid",QueryOptionConstant.IN + "(select f_oid from platformlt_" + getTaskDataLink() + " where f_btwname='" + getWorkIntanceBtmType() + "' " +
+ conditionMap.put("oid",QueryOptionConstant.IN + "(select f_oid from plt_" + getTaskDataLink() + " where f_btwname='" + getWorkIntanceBtmType() + "' " +
" and t_btwname='" + btmName + "' and t_oid = '" + bussinessOid + "' )");
conditionMap.put("lcstatus","Executing");
List<ProcessInstance> processInstances = boService.queryObject(ProcessInstance.class,conditionMap);
--
Gitblit v1.9.3