From 929915771a79b5b802fb85a931be1f5e0094fe96 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 08 十二月 2023 10:39:48 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 74939d7..5e9e678 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
@@ -162,12 +162,13 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase) throws VciBaseException {
BaseModel baseModel = object;
+ baseModel.getData().putAll(dataMap);
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- baseModel.setOid(dataMap.getOrDefault("OID",""));
- baseModel.setId(dataMap.getOrDefault("ID",""));
+ baseModel.setOid(dataMap.getOrDefault(isCase?"OID":"oid",""));
+ baseModel.setId(dataMap.getOrDefault(isCase?"ID":"id",""));
Map<String,Object> newDataMap=new HashMap<>();
/*for (String key:dataMap.keySet()){
Object value=dataMap.get(key);
@@ -177,52 +178,56 @@
newDataMap.put(key.toLowerCase(Locale.ROOT),value);
});*/
//baseModel.setData((Map)newDataMap);
- Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
+ Object createTimeObj=dataMap.getOrDefault(isCase?"CREATETIME":"createtime","");
if(createTimeObj!=null) {
String createTime = createTimeObj.toString();
baseModel.setCreateTime(chageStringToDate(createTime));
}
- baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
+ baseModel.setNameOid(dataMap.getOrDefault(isCase?"NAMEOID":"nameoid",""));
- Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
+ Object lastModifyTimeObj=dataMap.getOrDefault(isCase?"LASTMODIFYTIME":"lastmodifytime","");
if(lastModifyTimeObj!=null) {
String lastModifyTime = lastModifyTimeObj.toString();
baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
}
- Object tsObj=dataMap.getOrDefault("TS","");
+ Object tsObj=dataMap.getOrDefault(isCase?"TS":"ts","");
if(tsObj!=null) {
String ts = tsObj.toString();
baseModel.setTs(chageStringToDate(ts));
}
- baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
+ baseModel.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
//鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
// String userId = AuthUtil.getUserId().toString();
- baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
- baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
- baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
- baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
- baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
- baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
- Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
+ baseModel.setBtmname(dataMap.getOrDefault(isCase?"BTMNAME":"btmname",""));
+ baseModel.setCreator(dataMap.getOrDefault(isCase?"CREATOR":"creator",""));
+ baseModel.setFirstR(dataMap.getOrDefault(isCase?"FIRSTR":"firstr",""));
+ baseModel.setFirstV(dataMap.getOrDefault(isCase?"FIRSTV":"firstv",""));
+ baseModel.setLastR(dataMap.getOrDefault(isCase?"LASTR":"lastr",""));
+ baseModel.setLastV(dataMap.getOrDefault(isCase?"LASTV":"lastv",""));
+ Object revisionseq =dataMap.getOrDefault(isCase?"REVISIONSEQ":"revisionseq","");
if(revisionseq!=null){
baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
}
- baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
- Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
+ baseModel.setOwner(dataMap.getOrDefault(isCase?"OWNER":"owner",""));
+ Object versionseq =dataMap.getOrDefault(isCase?"VERSIONSEQ":"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.setVersionRule(dataMap.getOrDefault(isCase?"VERSIONRULE":"versionrule",""));
+ baseModel.setVersionValue(dataMap.getOrDefault(isCase?"VERSIONVALUE":"versionvalue",""));
+
+ baseModel.setRevisionRule(dataMap.getOrDefault(isCase?"REVISIONRULE":"revisionrule",""));
+
+ baseModel.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
+ baseModel.setRevisionValue(dataMap.getOrDefault(isCase?"REVISIONVALUE":"revisionvalue",""));
baseModel.setLastModifier(AuthUtil.getUser().getAccount());
- baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
- baseModel.setName(dataMap.getOrDefault("NAME",""));
- baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
- baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
- baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
- Object secretgrade=dataMap.get("SECRETGRADE");
+ baseModel.setLcStatus(dataMap.getOrDefault(isCase?"LCSTATUS":"lcstatus",""));
+ baseModel.setName(dataMap.getOrDefault(isCase?"NAME":"name",""));
+ baseModel.setTenantId(dataMap.getOrDefault(isCase?"TENANT_ID":"tenant_id",""));
+ baseModel.setDescription(dataMap.getOrDefault(isCase?"DESCRIPTION":"description",""));
+ baseModel.setCopyFromVersion(dataMap.getOrDefault(isCase?"COPYFROMVERSION":"copyfromversion",""));
+ Object secretgrade=dataMap.get(isCase?"SECRETGRADE":"secretgrade");
if(secretgrade!=null){
baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
}
--
Gitblit v1.9.3