From 6af6557a8d8a525ec3cab33607b8a041ef0968fa Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 11:15:31 +0800
Subject: [PATCH] 历史导入生成编码时添加前后缀代码逻辑添加；历史导入模板下载时查询模板返回的key不区分大小写。
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
index c5b577a..9331220 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.wrapper;
+import com.vci.ubcs.omd.constant.BtmTypeConstant;
import com.vci.ubcs.omd.dto.BtmTypeDTO;
import com.vci.ubcs.omd.entity.BtmType;
import com.vci.ubcs.omd.vo.BtmTypeVO;
@@ -35,8 +36,8 @@
@Override
public BtmTypeVO entityVO(BtmType entity) {
BtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeVO.class));
- vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
- vo.setTableName(vo.getTableName().toUpperCase(Locale.ROOT));
+ vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
+ vo.setTableName(vo.getTableName() == null? "" : vo.getTableName().toUpperCase(Locale.ROOT));
// 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
vo.setRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getRevisionFlag()));
vo.setSecretFlag(BooleanEnum.TRUE.getValue().equals(entity.getSecretFlag()));
@@ -89,7 +90,7 @@
*/
public BtmType entityBeforeSave(BtmType btmTypeDO) {
btmTypeDO.setOid(VciBaseUtil.getPk());
- btmTypeDO.setBtmName("btmType");
+ btmTypeDO.setBtmName(BtmTypeConstant.BTMTYPE);
Date now = new Date();
String userAccount = AuthUtil.getUserAccount();
btmTypeDO.setLastModifier(userAccount);
--
Gitblit v1.9.3