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-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java | 4 ++--
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 8 ++++----
Source/plt-web/plt-web-parent/plt-web/src/test/java/BoServiceTest.java | 2 +-
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java | 6 +++---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java | 2 +-
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java
index 23e6c61..8eb12b6 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileDocClassifyDO.java
@@ -12,7 +12,7 @@
* @author weidy
* @date 2020/8/4 8:30
*/
-@VciBtmType(name = VciFileBtmTypeConstant.FILE_DOC_CLASSIFY,tableName = "platformbtm_"+ VciFileBtmTypeConstant.FILE_DOC_CLASSIFY,text = "鏂囨。鐨勭被鍨�",description = "鏂囨。鐨勭敤閫�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
+@VciBtmType(name = VciFileBtmTypeConstant.FILE_DOC_CLASSIFY,tableName = "pbt_"+ VciFileBtmTypeConstant.FILE_DOC_CLASSIFY,text = "鏂囨。鐨勭被鍨�",description = "鏂囨。鐨勭敤閫�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
@Transient
public class VciFileDocClassifyDO extends BaseModel {
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java
index a3bfe98..63bde17 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/VciFileObjectDO.java
@@ -13,7 +13,7 @@
* @author weidy
* @date 2020/3/12
*/
-@VciBtmType(name = VciFileBtmTypeConstant.FILE_OBJECT,tableName = "platformbtm_"+ VciFileBtmTypeConstant.FILE_OBJECT,text = "鏂囦欢瀵硅薄",revisionRuleInput = true,secretAble = true,
+@VciBtmType(name = VciFileBtmTypeConstant.FILE_OBJECT,tableName = "pbt_"+ VciFileBtmTypeConstant.FILE_OBJECT,text = "鏂囦欢瀵硅薄",revisionRuleInput = true,secretAble = true,
lifeCycle = VciFileLifeConstant.FILE_LC,startStatus = VciFileDefaultValueConstant.FILE_LC_STATUS_INIT)
@Transient
public class VciFileObjectDO extends BaseModel {
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
index ee58816..105768a 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
@@ -1820,7 +1820,7 @@
* @return 鏁版嵁搴撹〃鏍煎悕绉�
*/
public static String getTableName(String btmname) {
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"platformbtm_":"vcibt_") + btmname.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"pbt_":"vcibt_") + btmname.trim().toLowerCase();
}
/**
@@ -1829,7 +1829,7 @@
* @return 鏁版嵁搴撹〃鏍煎悕绉�
*/
public static String getLinkTableName(String linkName){
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"platformlt_":"vcilt_")+ linkName.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"plt_":"vcilt_")+ linkName.trim().toLowerCase();
}
/**
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);
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 00ffad6..c1b9f54 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
@@ -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) {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
index 4ce0d63..6f11919 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
@@ -49,7 +49,7 @@
return;
}
- String sql = "SELECT T_OID,T_BTWNAME FROM PLATFORMLT_INPUT WHERE F_OID = '" + wfOid + "'";
+ String sql = "SELECT T_OID,T_BTWNAME FROM PLT_INPUT WHERE F_OID = '" + wfOid + "'";
List<BusinessObject> queryResult = boService.queryBySql(sql, new HashMap<>());
if (queryResult.size() == 0) {
logger.info("娌℃湁鎵惧埌涓氬姟鏁版嵁");
@@ -57,8 +57,8 @@
}
String btmName = ObjectTool.getBOAttributeValue(queryResult.get(0),"t_btwname");
String oid = ObjectTool.getBOAttributeValue(queryResult.get(0),"t_oid");
- String querySql = "select cac.oid from PLATFORMBTM_CODEALLCODE cac\n" +
- " left join PLATFORMBTM_" + btmName + " wp on cac.CREATECODEOID = wp.OID\n" +
+ String querySql = "select cac.oid from PBT_CODEALLCODE cac\n" +
+ " left join PBT_" + btmName + " wp on cac.CREATECODEOID = wp.OID\n" +
" where wp.OID = '" + oid + "'";
Map<String, String> conditionMap = new HashMap<>();
conditionMap.put("oid", oid);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/test/java/BoServiceTest.java b/Source/plt-web/plt-web-parent/plt-web/src/test/java/BoServiceTest.java
index e251203..5f36ce2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/test/java/BoServiceTest.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/test/java/BoServiceTest.java
@@ -28,7 +28,7 @@
@Test
public void test(){
- String sql = "select * from platformbtm_part where oid = 'E2ADEE0E-20F9-4CE2-A904-114460B01EB7'";
+ String sql = "select * from pbt_part where oid = 'E2ADEE0E-20F9-4CE2-A904-114460B01EB7'";
//List<BusinessObject> list = boServiceI.queryByOnlySql(sql);
//List<PartDO> list = boServiceI.queryByOnlySqlForObj(sql, PartDO.class);
Map<String, String> conditonMap = new HashMap<>();
--
Gitblit v1.9.3