diff --git a/src/main/java/com/spring/ifs/bean/TechnicalClassBean.java b/src/main/java/com/spring/ifs/bean/TechnicalClassBean.java index 8950ca63..a85546c5 100644 --- a/src/main/java/com/spring/ifs/bean/TechnicalClassBean.java +++ b/src/main/java/com/spring/ifs/bean/TechnicalClassBean.java @@ -208,6 +208,7 @@ public class TechnicalClassBean { for(PartIfsCatalogProperty tempData : paramList) { //设置替代的ifs的key tempData.setTechnicalSpecNo(technicalSpecNo); + logger.info("属性编码:"+tempData.getAttribute()); //api修改参数 Map resultMap = TechnicalClassApi.modifyTechnicalAttribute(srv, tempData); //设置记录的版本 @@ -268,12 +269,18 @@ public class TechnicalClassBean { && (null == valueNo || "NULL".equalsIgnoreCase(valueNo) || valueNo.trim().isEmpty())){ continue; }else if (!newValueNo.equals(valueNo)){ - //判断是否是相同大小的数字 - BigDecimal oriValue = new BigDecimal(valueNo); - oriValue = oriValue.setScale(6, BigDecimal.ROUND_HALF_UP); - BigDecimal newValue = new BigDecimal(newValueNo); - if(oriValue.compareTo(newValue) == 0) { - continue; + if ((newValueNo != null && "".equals(newValueNo.trim())) || (valueNo != null && "".equals(valueNo.trim()))){ + //添加ifsRowId ifsRowVersion + logger.info("可以放到修改中: 原始值:"+valueNo+",新值:"+newValueNo); + }else { + //判断是否是相同大小的数字 + BigDecimal oriValue = new BigDecimal(valueNo); + oriValue = oriValue.setScale(6, BigDecimal.ROUND_HALF_UP); + logger.info("原始值:"+oriValue+",新值:"+newValueNo); + BigDecimal newValue = new BigDecimal(newValueNo); + if(oriValue.compareTo(newValue) == 0) { + continue; + } } } } diff --git a/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java index 1448be85..4808dc36 100644 --- a/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java +++ b/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java @@ -507,13 +507,11 @@ public class PropertiesServiceImpl implements PropertiesService { String textValue = propertyValue.getTextValue(); Double numValue = propertyValue.getNumValue(); String numValueStr = ""; - //null处理 + //如果数据为null 且对应的数据类型需要这个数据则跳过当前的循环 if(null == textValue || "".equals(textValue)){ textValue = ""; } - if(null == numValue){ - numValue = 0.0; - }else { + if(null != numValue){ numValueStr = String.valueOf(numValue); BigDecimal bd = new BigDecimal(numValueStr).stripTrailingZeros(); numValueStr = bd.toString();