From cee3075e880a5fca55160000f0597019f974eb9e Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 28 八月 2023 17:52:57 +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 | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 0430da1..2cf2df2 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
@@ -6,6 +6,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
import java.lang.reflect.Field;
import java.math.BigDecimal;
@@ -49,7 +50,10 @@
baseModel.setLastR("1");
baseModel.setLastV("1");
baseModel.setRevisionSeq(1);
- baseModel.setOwner("1");
+ if(Func.isBlank(baseModel.getOwner())){
+ // 璁剧疆鎵�鏈夎��
+ baseModel.setOwner(AuthUtil.getUserId().toString());
+ }
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
@@ -82,8 +86,6 @@
return (T)baseModel;
}
-
-
/**
* 鏂板鏃跺～鍏呴粯璁ゅ��
* @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
@@ -96,14 +98,25 @@
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
baseModel.setOid(dataMap.getOrDefault("OID",""));
- String createTime=dataMap.getOrDefault("CREATETIME","");
- baseModel.setCreateTime(chageStringToDate(createTime));
+ baseModel.setId(dataMap.getOrDefault("ID",""));
+ baseModel.setData(dataMap);;
+ Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
+ if(createTimeObj!=null) {
+ String createTime = createTimeObj.toString();
+ baseModel.setCreateTime(chageStringToDate(createTime));
+ }
baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
- String lastModifyTime=dataMap.getOrDefault("LASTMODIFYTIME","");
- baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
- String ts=dataMap.getOrDefault("TS","");
- baseModel.setTs(chageStringToDate(ts));
+ Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
+ if(lastModifyTimeObj!=null) {
+ String lastModifyTime = lastModifyTimeObj.toString();
+ baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
+ }
+ Object tsObj=dataMap.getOrDefault("TS","");
+ if(tsObj!=null) {
+ String ts = tsObj.toString();
+ baseModel.setTs(chageStringToDate(ts));
+ }
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
//鐢ㄦ埛id
String userId = AuthUtil.getUserId().toString();
@@ -113,13 +126,22 @@
baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
- baseModel.setRevisionSeq(chageStringToInt(dataMap.getOrDefault("REVISIONSEQ","")));
+ Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
+ if(revisionseq!=null){
+
+ baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
+ }
+
baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
- baseModel.setVersionSeq(chageStringToInt(dataMap.getOrDefault("VERSIONSEQ","")));
+ Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
+ if(versionseq!=null){
+ 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