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/DllOracleMapperProcessor.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
index 41ed763..9e92da4 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
@@ -1,12 +1,19 @@
package com.vci.ubcs.ddl.processor.dll;
+<<<<<<< HEAD
+=======
+import com.vci.starter.web.enumpck.VciFieldTypeEnum;
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import com.vci.ubcs.ddl.mapper.DllMapper;
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;
import org.springframework.util.CollectionUtils;
+=======
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@@ -50,7 +57,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);
@@ -99,7 +106,7 @@
* @return sql
*/
@Override
- public String dealStringCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealStringCreateSql(BtmTypeAttributeVO attributeVO) {
Integer length2 = attributeVO.getAttributeLength();
StringBuilder sb = new StringBuilder();
if(length2 == null){
@@ -122,7 +129,7 @@
* @return sql
*/
@Override
- public String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO) {
return TIMESTAMP + SPACE + dealNullableSql(attributeVO);
}
@@ -133,7 +140,7 @@
* @return sql
*/
@Override
- public String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO) {
return VARCHAR + "(5)" + SPACE + dealDefaultAndNull(attributeVO);
}
}
--
Gitblit v1.9.3