From 1b8120cacac0037fcb1f8ae747c2f54eb735368b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 五月 2023 18:50:51 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index df1c12d..f313a07 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -6,8 +6,8 @@
 import com.vci.ubcs.code.service.ICodeClassifyService;
 import com.vci.ubcs.code.service.MdmEngineService;
 import com.vci.ubcs.code.service.MdmIOService;
-import com.vci.ubcs.code.vo.CodeClstempattrVO;
 import com.vci.ubcs.code.vo.CodeClstemplateVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;
 import com.vci.ubcs.starter.bo.WriteExcelData;
@@ -103,17 +103,17 @@
 			//鍙傜収鐨勮嚜琛岃緭鍏ュ悕绉�
 			//鍒嗙被娉ㄥ叆鐨勪笉鐢紝閮芥槸瀵煎叆鍚庤嚜鍔ㄥ鐞嗙殑
 			//缂栫爜锛岀姸鎬佺瓑瀛楁涓嶅鍏�
-			List<CodeClstempattrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
+			List<CodeClassifyTemplateAttrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
 				!DEFAULT_ATTR_LIST.contains(s.getId())
-					&& StringUtils.isBlank(s.getComponentrule())
-					&& StringUtils.isBlank(s.getClassifyinvokeattr())
-					&& (isHistory || VciBaseUtil.getBoolean(s.getFormdisplayflag()))
+					&& StringUtils.isBlank(s.getComponentRule())
+					&& StringUtils.isBlank(s.getClassifyInvokeAttr())
+					&& (isHistory || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
 			).collect(Collectors.toList());
 
 			if(CollectionUtils.isEmpty(templateAttrVOS)){
 				throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
 			}
-			List<CodeClstempattrVO> idAttrVOList = templateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
+			List<CodeClassifyTemplateAttrVO> idAttrVOList = templateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
 			LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
 			Workbook workbook = new HSSFWorkbook();
 			if(isHistory){
@@ -122,23 +122,23 @@
 				excelDataList.add(new WriteExcelData(0,2,!CollectionUtils.isEmpty(idAttrVOList)?idAttrVOList.get(0).getName():"浼佷笟缂栫爜"));
 			}
 			for (int i = 0; i < templateAttrVOS.size(); i++) {
-				CodeClstempattrVO attrVO = templateAttrVOS.get(i);
+				CodeClassifyTemplateAttrVO attrVO = templateAttrVOS.get(i);
 
 				Object text = attrVO.getName();
 				text = exportKeyAndRequired(workbook,attrVO,text);
 				int colIndex = (isHistory?3:0) + i;
 				WriteExcelData excelData = new WriteExcelData(0, colIndex, text);
-				if(StringUtils.isNotBlank(attrVO.getCodedateformat())
-					|| VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())
-					|| VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributedatatype())
-					||VciFieldTypeEnum.VTTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
+				if(StringUtils.isNotBlank(attrVO.getCodeDateFormat())
+					|| VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributeDataType())
+					|| VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributeDataType())
+					||VciFieldTypeEnum.VTTime.name().equalsIgnoreCase(attrVO.getAttributeDataType())){
 					excelData.setDateFormat(VciDateUtil.DateTimeFormat);
 				}
 				if(text instanceof RichTextString){
 					excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
 				}
 				excelDataList.add(excelData);
-				if(StringUtils.isNotBlank(attrVO.getEnumstring()) || StringUtils.isNotBlank(attrVO.getEnumid())){
+				if(StringUtils.isNotBlank(attrVO.getEnumString()) || StringUtils.isNotBlank(attrVO.getEnumId())){
 					//娣诲姞鏁版嵁鏈夋晥鎬�
 					List<String> enumValueList = new ArrayList<>();
 					enumValueList.add("");
@@ -157,7 +157,7 @@
 					ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝g‘鐨勫��");
 					excelDataList.add(ed);
 				}
-				if(VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
+				if(VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributeDataType())){
 					List<String> booleanList = new ArrayList<>();
 
 					booleanList.add("鏄�");
@@ -188,24 +188,24 @@
 	 * @param attrVO 灞炴�х殑鏄剧ず瀵硅薄
 	 * @param text 鍗曞厓鏍肩殑鍊�
 	 */
-	private Object exportKeyAndRequired(Workbook workbook,CodeClstempattrVO attrVO,Object text){
+	private Object exportKeyAndRequired(Workbook workbook,CodeClassifyTemplateAttrVO attrVO,Object text){
 		//蹇呰緭鍔�*锛屽叧閿睘鎬т负钃濊壊
-		if (VciBaseUtil.getBoolean(attrVO.getRequireflag()) || VciBaseUtil.getBoolean(attrVO.getKeyattrflag())) {
+		if (VciBaseUtil.getBoolean(attrVO.getRequireFlag()) || VciBaseUtil.getBoolean(attrVO.getKeyAttrFlag())) {
 			String value = text.toString();
-			if(VciBaseUtil.getBoolean(attrVO.getRequireflag())) {
+			if(VciBaseUtil.getBoolean(attrVO.getRequireFlag())) {
 				value += REQUIRED_CHAR;
 			}
-			if(VciBaseUtil.getBoolean(attrVO.getKeyattrflag())){
+			if(VciBaseUtil.getBoolean(attrVO.getKeyAttrFlag())){
 				value += KEY_ATTR_CHAR;
 			}
 			RichTextString ts = new HSSFRichTextString(value);
-			if(VciBaseUtil.getBoolean(attrVO.getRequireflag())){
+			if(VciBaseUtil.getBoolean(attrVO.getRequireFlag())){
 				Font font =  workbook.createFont();
 				font.setColor(HSSFColor.HSSFColorPredefined.RED.getIndex());
 				ts.applyFont(font);
 			}
 
-			if(VciBaseUtil.getBoolean(attrVO.getKeyattrflag())){
+			if(VciBaseUtil.getBoolean(attrVO.getKeyAttrFlag())){
 				Font font =  workbook.createFont();
 				font.setColor(HSSFColor.HSSFColorPredefined.BLUE.getIndex());
 				ts.applyFont(font);

--
Gitblit v1.9.3