From c9d33bba9604987cb881fc97d014b6f4bfaab23a Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 18 九月 2023 14:12:40 +0800 Subject: [PATCH] 申请集团码相关接口加上特殊取集团码的情况处理 --- Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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 2cf2df2..a004b76 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()); @@ -99,7 +100,15 @@ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); baseModel.setOid(dataMap.getOrDefault("OID","")); baseModel.setId(dataMap.getOrDefault("ID","")); - baseModel.setData(dataMap);; + 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(); -- Gitblit v1.9.3