From 13f2d9d9b067d571f37fc14fe8ea4399eaad2547 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 13 九月 2023 08:45:23 +0800 Subject: [PATCH] 代码提交 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java index 0119b7a..3c693e1 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java @@ -437,18 +437,11 @@ //澶囨敞 cbo.setDescription(orderDTO.getDescription()); cboList.add(cbo); -// -// cboList.add(cbo); + List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList); - -// List<String> charList = new ArrayList<>(); -// for (BaseModel baseModel : cboList) { -// charList.add(baseModel.getId()); -// } batchSaveSelectChar(templateVO, cboList); return codeList.size() > 0 ? codeList.get(0) : ""; -// return null; } /** @@ -2415,7 +2408,6 @@ return phaseAttrService.listAttrByTemplateOidAndPhaseId(templateVO.getOid(), phase); } - /** * 璺緞涓婂寘鍚綋鍓嶅垎绫荤殑鎵�鏈夊垎绫讳俊鎭� * @@ -2763,13 +2755,13 @@ CodeSecTypeEnum.CODE_FIXED_SEC.getValue(), CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(), CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(), - CodeSecTypeEnum.CODE_REFER_SEC.getValue() + CodeSecTypeEnum.CODE_REFER_SEC.getValue(), + CodeSecTypeEnum.CODE_DATE_SEC.getValue() ); // 鍙鐮佹绫诲瀷 List<String> readOnlyTypes = Arrays.asList( CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(), - CodeSecTypeEnum.CODE_ATTR_SEC.getValue(), - CodeSecTypeEnum.CODE_DATE_SEC.getValue() + CodeSecTypeEnum.CODE_ATTR_SEC.getValue() ); // 闅愯棌鐮佹绫诲瀷 /*List<String> hideType = Arrays.asList( @@ -3919,7 +3911,6 @@ treeWrapperOptions.setParentOid(queryObject.getParentOid()); return revisionModelUtil.doList2Trees(codeClassifies, treeWrapperOptions, null); } - @Override public boolean checkUnAttrUnEdit(String attrName) { -- Gitblit v1.9.3