From 549ecbf13b14a4deb74e42828abcd46ccb68a7c0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 09 五月 2023 17:18:07 +0800
Subject: [PATCH] 前端代码提交

---
 Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java
index b211b73..eab3885 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java
@@ -153,18 +153,18 @@
 		List<VciFieldTypeEnum> fieldTypes = listFieldInMapByColumnStr(columnStr, map);
 		VciFieldTypeEnum finalField = null;
 		int i = Integer.MAX_VALUE;
-		if (CollectionUtils.isEmpty(fieldTypes)){
-			return null;
-		}
 		if (fieldTypes.size() == 1){
 			return fieldTypes.get(0);
 		}
 		for (VciFieldTypeEnum fieldType : fieldTypes) {
-			DdlFieldMappingAttrBO bo = map.get(fieldType);
-			int i1 = Math.abs(bo.getDataLength() - length);
-			if (i1 < i){
-				finalField = fieldType;
-				i = i1;
+			if (fieldType.equals(VciFieldTypeEnum.VTString)) {
+				finalField = VciFieldTypeEnum.VTString;
+			}
+			if (fieldType.equals(VciFieldTypeEnum.VTDateTime)){
+				finalField = VciFieldTypeEnum.VTDateTime;
+			}
+			if (fieldType.equals(VciFieldTypeEnum.VTInteger) && length <= 26){
+				finalField = VciFieldTypeEnum.VTInteger;
 			}
 		}
 		return finalField;

--
Gitblit v1.9.3