From 3cb0cef6f7189dcbb537df52cef5921d1d2c3cd9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 26 四月 2023 00:12:23 +0800
Subject: [PATCH] 代码整合

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

diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
index 4f5f19c..6ade30a 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
@@ -3,11 +3,13 @@
 
 import com.vci.ubcs.ddl.mapper.DllMapper;
 import com.vci.ubcs.ddl.mapper.DllMsMapper;
-import com.vci.ubcs.ddl.mapper.DllOracleMapper;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
+<<<<<<< HEAD
 import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
 import org.apache.commons.lang3.StringUtils;
+=======
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -51,7 +53,7 @@
 	 * @return sql璇彞
 	 */
 	@Override
-	public String getCreateSqlByAttributeForBtm(List<OmdBtmTypeAttributeVO> attributeVOList) {
+	public String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList) {
 		StringBuilder sb = new StringBuilder();
 		attributeVOList.forEach(a -> {
 			sb.append(a.getId()).append(SPACE);
@@ -100,7 +102,7 @@
 	 * @return sql
 	 */
 	@Override
-	public String dealNumberCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+	public String dealNumberCreateSql(BtmTypeAttributeVO attributeVO) {
 		return "INT" + SPACE + dealDefaultAndNull(attributeVO);
 	}
 
@@ -111,7 +113,7 @@
 	 * @return sql
 	 */
 	@Override
-	public String dealDoubleCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+	public String dealDoubleCreateSql(BtmTypeAttributeVO attributeVO) {
 		Integer length = attributeVO.getPrecisionLength();
 		if(length == null || length == 0){
 			length = 20;
@@ -135,7 +137,7 @@
 	 * @return sql
 	 */
 	@Override
-	public String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+	public String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO) {
 		return "VARCHAR (5) " + SPACE + dealDefaultAndNull(attributeVO);
 	}
 
@@ -146,7 +148,7 @@
 	 * @return sql
 	 */
 	@Override
-	public String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+	public String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO) {
 		return "DATETIME" + SPACE + dealNullableSql(attributeVO);
 	}
 
@@ -157,7 +159,7 @@
 	 * @return sql
 	 */
 	@Override
-	public String dealStringCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+	public String dealStringCreateSql(BtmTypeAttributeVO attributeVO) {
 		Integer length2 = attributeVO.getAttributeLength();
 		if(length2 == null){
 			length2 = 250;

--
Gitblit v1.9.3