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; @@ -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(); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -2327,6 +2327,7 @@ sb.append(" select * from "); sb.append(tableName); sb.append(" where 1=1 "); sb.append(" and lastr=1 and lastv=1" ); if(isCodeOrGroupCode) { sb.append(" and groupcode in ("); }else{ @@ -4021,7 +4022,7 @@ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject); for (String key:dataMap.keySet()){ Object value= dataMap.getOrDefault(key,""); clientBusinessObject.setAttributeValue(key,value==null?"":value.toString()); clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString()); } clientBusinessObjectList.add(clientBusinessObject); }); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -748,18 +748,6 @@ Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t)); List<PropertyVO> propertyVOS=condtionVO.getPro(); /*Map<String,String> condtionMap=new HashMap<>(); propertyVOS.stream().forEach(propertyVO -> { condtionMap.put(propertyVO.getFiledName(),propertyVO.getFiledValue()); }); condtionMap.put("codeclsfid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) + ")"); List<String>statusList=new ArrayList<>(); statusList.add(CodeDefaultLC.RELEASED.getValue()); statusList.add(CodeDefaultLC.DISABLE.getValue()); statusList.add(CodeDefaultLC.TASK_BACK.getValue()); condtionMap.put("Lcstatus", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) + ")" ); condtionMap.put("islastr", "1"); condtionMap.put("islastv", "1");*/ List<String>statusList=new ArrayList<>(); statusList.add(CodeDefaultLC.RELEASED.getValue()); statusList.add(CodeDefaultLC.DISABLE.getValue()); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/ClientBusinessObject.java
@@ -6,6 +6,7 @@ import lombok.Data; import java.util.ArrayList; import java.util.Locale; @Data public class ClientBusinessObject extends BaseModel { @@ -35,7 +36,7 @@ } public void setAttributeValueWithNoCheck(String attributeName, String attributeValue, boolean isCreate) throws VciBaseException { /*if (isCreate) {//&& BusinessConstants.BO_CONSTANTS.containsKey(attributeName.toUpperCase()) /*if (isCreate) {//&& BusinessConstants.BO_CONSTANTS.containsKey(attributeName.toLowerCase(Locale.ROOT)) this.setConstantsAttrVal(attributeName, attributeValue); } else {*/ AttributeValue[] attrValues = this.newAttrValList; @@ -57,7 +58,7 @@ for(i = 0; i < attrValList.size(); ++i) { attrVal = (AttributeValue)attrValList.get(i); if (attrVal.attrName.toUpperCase().equals(attributeName.toUpperCase())) { if (attrVal.attrName.toLowerCase(Locale.ROOT).equals(attributeName.toLowerCase(Locale.ROOT))) { attrVal.attrVal = attributeValue; isExist = true; break; @@ -66,12 +67,12 @@ if (!isExist) { attrVal = new AttributeValue(); attrVal.attrName = attributeName.toUpperCase(); attrVal.attrName = attributeName.toLowerCase(Locale.ROOT); attrVal.attrVal = attributeValue; attrValList.add(attrVal); } this.getData().put(attributeName,attributeValue); this.getData().put(attributeName.toLowerCase(Locale.ROOT),attributeValue); this.newAttrValList = (AttributeValue[])attrValList.toArray(new AttributeValue[attrValList.size()]); // } } @@ -82,7 +83,7 @@ int i; if (this.newAttrValList != null) { for(i = 0; i < this.newAttrValList.length; ++i) { if (this.newAttrValList[i].attrName.toUpperCase().equals(attrName.toUpperCase())) { if (this.newAttrValList[i].attrName.toLowerCase(Locale.ROOT).equals(attrName.toLowerCase(Locale.ROOT))) { existInNewAttr = true; res = this.newAttrValList[i].attrVal; } @@ -95,7 +96,7 @@ return ""; } else { for(i = 0; i < this.hisAttrValList.length; ++i) { if (this.hisAttrValList[i].attrName.toUpperCase().equals(attrName.toUpperCase())) { if (this.hisAttrValList[i].attrName.toLowerCase(Locale.ROOT).equals(attrName.toLowerCase(Locale.ROOT))) { res = this.hisAttrValList[i].attrVal; } }
