From 1f0a10ab714699acc85430b90bcb5a1eeaad1eec Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 17 七月 2023 10:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
index 3b79f45..4abcfef 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -1,6 +1,8 @@
package com.vci.ubcs.code.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
@@ -11,13 +13,14 @@
import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.*;
+import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO;
import org.springblade.core.tool.api.R;
-import java.beans.IntrospectionException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -101,7 +104,7 @@
* @param cboList 鏁版嵁鐨勫唴瀹�
*/
void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, /*List<ClientBusinessObject> cboList*/
- List<String> cboList);
+ List<BaseModel> cboList);
/**
* 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
@@ -369,6 +372,14 @@
* @return UI鐩稿叧鐨勫唴瀹�
*/
MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid, String functionId);
+ /**
+ * 浣跨敤鍒嗙被涓婚敭锛屾ā鏉夸富閿紝闃舵鏍囪瘑锛屾祦绋嬫ā鏉縦ek鑾峰彇娴佺▼瀹℃壒涓〉闈㈢殑鍐呭锛屽寘鍚寜閽�
+ *
+ * @param codeClassifyOid 涓婚搴撳垎绫讳富閿�
+ * @param functionId 鍔熻兘鐨勭紪鍙�,榛樿5
+ * @return UI鐩稿叧鐨勫唴瀹�
+ */
+ MdmUIInfoVO getFlowUIInfoByClassifyOid(String codeClassifyOid, String functionId,String templateId,String taskId,String modelKey);
/**
* 浼犲叆涓氬姟绫诲瀷浠ュ強鐩稿叧鏁版嵁杩涜鎵归噺鎻掑叆鎿嶄綔
@@ -395,4 +406,34 @@
*/
R updateBatchByBaseModel(String btmType, List<BaseModel> baseModels);
+ /**
+ * 榛樿鍒楄〃
+ * @param referConfigVO
+ * @return
+ */
+ IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException;
+
+ /**
+ * 鑾峰彇鏍戝舰鐨勫弬鐓�
+ * @param referConfigVO 鍙傜収鐨勯厤缃�
+ * @return 鏍戝舰鐨勬暟鎹�
+ */
+ List<Tree> referTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject);
+
+
+ /**
+ * 鏄惁涓轰慨鏀瑰拷鐣ョ殑灞炴��
+ * @param attrName 灞炴�х殑鍚嶅瓧
+ * @return true 琛ㄧず搴旇蹇界暐
+ */
+ default boolean checkUnAttrUnEdit(String attrName){
+ return (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
+ ||"ts".equalsIgnoreCase(attrName)
+ || "lastmodifier".equalsIgnoreCase(attrName)
+ || "lastmodifytime".equalsIgnoreCase(attrName)
+ || "createtime".equalsIgnoreCase(attrName)
+ || "checkintime".equalsIgnoreCase(attrName)
+ ||"checkouttime".equalsIgnoreCase(attrName));
+ }
+
}
--
Gitblit v1.9.3