From 36d3d9da36c71e65081e38cf9cfbd5e0ff6bfeed Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 14 七月 2023 21:15:42 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 93 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 81 insertions(+), 12 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 44f60a6..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,31 +1,36 @@ 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; import com.vci.ubcs.code.dto.CodeDeleteBatchDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.dto.datapush.BaseModelDTO; -import com.vci.ubcs.code.entity.CodeAllCode; -import com.vci.ubcs.code.entity.CodeKeyAttrRepeat; -import com.vci.ubcs.code.entity.CodeWupinEntity; +import com.vci.ubcs.code.entity.CodeWupin; import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO; -import com.vci.ubcs.code.vo.pagemodel.*; 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 org.springframework.util.CollectionUtils; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 涓绘暟鎹紩鎿庢湇鍔� * @author weidy * @date 2022-2-21 */ -public interface MdmEngineService extends IService<CodeWupinEntity> { +public interface MdmEngineService extends IService<CodeWupin> { /** * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄 * @param codeClassifyOid 鍒嗙被鐨勪富閿� @@ -59,7 +64,7 @@ * @param orderDTO 鐢宠鐨勪俊鎭紝闇�瑕佸寘鍚睘鎬х殑鍐呭鍜岀爜娈电浉鍏崇殑鍐呭 * @return 杩斿洖缂栫爜鐨勫唴瀹� */ - String addSaveCode(CodeOrderDTO orderDTO); + String addSaveCode(CodeOrderDTO orderDTO) throws Exception; /** * 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊� @@ -88,9 +93,9 @@ * 鍒濆鍖栦笟鍔$被鍨� * --鍒涘缓浜洪粯璁や负褰撳墠鐢ㄦ埛锛屽鏋滈渶瑕佷慨鏀癸紝鍙互鍦ㄨ幏鍙栧悗鑷澶勭悊 * @param btmName 涓氬姟绫诲瀷鐨勫悕绉帮紝浼氳嚜鍔ㄥ彉鎴愬皬鍐� - * @return CodeWupinEntity + * @return BaseModel */ - CodeWupinEntity createCBOByBtmName(String btmName); + BaseModel createCBOByBtmName(String btmName); /** * 淇濆瓨鍙緭鍙�夌殑淇℃伅 @@ -99,7 +104,7 @@ * @param cboList 鏁版嵁鐨勫唴瀹� */ void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, /*List<ClientBusinessObject> cboList*/ - List<String> cboList); + List<BaseModel> cboList); /** * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅 @@ -367,4 +372,68 @@ * @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); + + /** + * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩稿叧鏁版嵁杩涜鎵归噺鎻掑叆鎿嶄綔 + * + * @param btmType 涓氬姟绫诲瀷 + * @param baseModels 澶勭悊鏁版嵁 + * @return 澶勭悊鎴愬姛鏁版嵁鏉℃暟 + */ + Integer insertBatchByType(String btmType, List<BaseModel> baseModels); + /** + * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩竜id闆嗗悎鏌ヨ鏁版嵁杩涜杩斿洖 + * + * @param btmType 涓氬姟绫诲瀷 + * @param oids 闇�瑕佹煡璇㈢殑oid闆嗗悎 閫楀彿鍒嗗紑 + * @return 鏌ヨ鍑虹殑鏁版嵁 + */ + List<BaseModel> selectByTypeAndOid(String btmType, String oids) ; + /** + * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩稿叧鏁版嵁杩涜鎵归噺鏇存柊鎿嶄綔 + * + * @param btmType 涓氬姟绫诲瀷 + * @param baseModels 澶勭悊鏁版嵁 + * @return 澶勭悊鐘舵�� + */ + 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