From 773d9314b7f1bf4dce390bf8fa0b6a9b12e32344 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 25 六月 2023 14:25:43 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 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..3fc3b22 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 @@ -96,13 +96,16 @@ try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); baseModel.setOid(dataMap.getOrDefault("OID","")); - String createTime=dataMap.getOrDefault("CREATETIME",""); + Object createTimeObj=dataMap.getOrDefault("CREATETIME",""); + String createTime= createTimeObj.toString(); baseModel.setCreateTime(chageStringToDate(createTime)); baseModel.setNameOid(dataMap.getOrDefault("NAMEOID","")); - String lastModifyTime=dataMap.getOrDefault("LASTMODIFYTIME",""); + Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME",""); + String lastModifyTime= lastModifyTimeObj.toString(); baseModel.setLastModifyTime(chageStringToDate(lastModifyTime)); - String ts=dataMap.getOrDefault("TS",""); + Object tsObj=dataMap.getOrDefault("TS",""); + String ts= tsObj.toString(); baseModel.setTs(chageStringToDate(ts)); baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID","")); //鐢ㄦ埛id -- Gitblit v1.9.3