Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java

@@ -99,16 +99,22 @@
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         baseModel.setOid(dataMap.getOrDefault("OID",""));
         Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
         String createTime= createTimeObj.toString();
         baseModel.setCreateTime(chageStringToDate(createTime));
         if(createTimeObj!=null) {
            String createTime = createTimeObj.toString();
            baseModel.setCreateTime(chageStringToDate(createTime));
         }
         baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));

         Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
         String lastModifyTime= lastModifyTimeObj.toString();
         baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
         if(lastModifyTimeObj!=null) {
            String lastModifyTime = lastModifyTimeObj.toString();
            baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
         }
         Object tsObj=dataMap.getOrDefault("TS","");
         String ts= tsObj.toString();
         baseModel.setTs(chageStringToDate(ts));
         if(tsObj!=null) {
            String ts = tsObj.toString();
            baseModel.setTs(chageStringToDate(ts));
         }
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         //用户id
         String userId = AuthUtil.getUserId().toString();
@@ -118,9 +124,18 @@
         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){
            BigDecimal b=(BigDecimal)revisionseq;
            baseModel.setRevisionSeq(chageStringToInt(b.toString()));
         }

         baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
         baseModel.setVersionSeq(chageStringToInt(dataMap.getOrDefault("VERSIONSEQ","")));
         Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
         if(versionseq!=null){
            BigDecimal b=(BigDecimal)versionseq;
            baseModel.setVersionSeq(chageStringToInt(b.toString()));
         }
         baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
         baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));