From 1df478bfab1a1e27d9c5e88f7c8c0fc71f904e8e Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 17 十月 2023 17:42:34 +0800
Subject: [PATCH] 1、设置allcode状态时，设置为业务数据的状态。
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 46b32b6..e1f4796 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;
@@ -35,7 +36,7 @@
public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
BaseModel baseModel = object;
try {
- baseModel.setOid(VciBaseUtil.getPk().toUpperCase());
+ baseModel.setOid(VciBaseUtil.getPk());
baseModel.setCreateTime(new Date());
baseModel.setNameOid(VciBaseUtil.getPk());
baseModel.setLastModifyTime(new Date());
@@ -44,7 +45,7 @@
//鐢ㄦ埛id
String userId = AuthUtil.getUserId().toString();
baseModel.setBtmname(btmName);
- baseModel.setCreator(userId);
+ baseModel.setCreator(AuthUtil.getUser().getAccount());
baseModel.setFirstR("1");
baseModel.setFirstV("1");
baseModel.setLastR("1");
@@ -98,6 +99,16 @@
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
baseModel.setOid(dataMap.getOrDefault("OID",""));
+ baseModel.setId(dataMap.getOrDefault("ID",""));
+ 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();
@@ -126,20 +137,20 @@
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",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
baseModel.setLastModifier(userId);
+
}catch (VciBaseException e){
e.printStackTrace();
}
--
Gitblit v1.9.3