From 01e690854cfd45322b07f3eafb91ff875dc7af7b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 15:45:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index cbc0047..106b325 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -13,6 +13,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -99,7 +100,15 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
baseModel.setOid(dataMap.getOrDefault("OID",""));
baseModel.setId(dataMap.getOrDefault("ID",""));
- baseModel.setData(dataMap);;
+ Map<String,Object> newDataMap=new HashMap<>();
+ /*for (String key:dataMap.keySet()){
+ Object value=dataMap.get(key);
+ newDataMap.put(key.toLowerCase(Locale.ROOT),value);
+ }*/
+ /* dataMap.forEach((key,value)->{
+ newDataMap.put(key.toLowerCase(Locale.ROOT),value);
+ });*/
+ //baseModel.setData((Map)newDataMap);
Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
if(createTimeObj!=null) {
String createTime = createTimeObj.toString();
@@ -128,15 +137,14 @@
baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
if(revisionseq!=null){
- BigDecimal b=(BigDecimal)revisionseq;
- baseModel.setRevisionSeq(chageStringToInt(b.toString()));
+
+ baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
}
baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
if(versionseq!=null){
- BigDecimal b=(BigDecimal)versionseq;
- baseModel.setVersionSeq(chageStringToInt(b.toString()));
+ baseModel.setVersionSeq(chageStringToInt(versionseq.toString()));
}
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
--
Gitblit v1.9.3