Browse Source

工具属性BUG 调整

master
Rui_Li 7 months ago
parent
commit
a28ad0b031
  1. 7
      src/main/java/com/spring/ifs/bean/TechnicalClassBean.java
  2. 6
      src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java

7
src/main/java/com/spring/ifs/bean/TechnicalClassBean.java

@ -208,6 +208,7 @@ public class TechnicalClassBean {
for(PartIfsCatalogProperty tempData : paramList) { for(PartIfsCatalogProperty tempData : paramList) {
//设置替代的ifs的key //设置替代的ifs的key
tempData.setTechnicalSpecNo(technicalSpecNo); tempData.setTechnicalSpecNo(technicalSpecNo);
logger.info("属性编码:"+tempData.getAttribute());
//api修改参数 //api修改参数
Map<String, String> resultMap = TechnicalClassApi.modifyTechnicalAttribute(srv, tempData); Map<String, String> resultMap = TechnicalClassApi.modifyTechnicalAttribute(srv, tempData);
//设置记录的版本 //设置记录的版本
@ -268,15 +269,21 @@ public class TechnicalClassBean {
&& (null == valueNo || "NULL".equalsIgnoreCase(valueNo) || valueNo.trim().isEmpty())){ && (null == valueNo || "NULL".equalsIgnoreCase(valueNo) || valueNo.trim().isEmpty())){
continue; continue;
}else if (!newValueNo.equals(valueNo)){ }else if (!newValueNo.equals(valueNo)){
if ((newValueNo != null && "".equals(newValueNo.trim())) || (valueNo != null && "".equals(valueNo.trim()))){
//添加ifsRowId ifsRowVersion
logger.info("可以放到修改中: 原始值:"+valueNo+",新值:"+newValueNo);
}else {
//判断是否是相同大小的数字 //判断是否是相同大小的数字
BigDecimal oriValue = new BigDecimal(valueNo); BigDecimal oriValue = new BigDecimal(valueNo);
oriValue = oriValue.setScale(6, BigDecimal.ROUND_HALF_UP); oriValue = oriValue.setScale(6, BigDecimal.ROUND_HALF_UP);
logger.info("原始值:"+oriValue+",新值:"+newValueNo);
BigDecimal newValue = new BigDecimal(newValueNo); BigDecimal newValue = new BigDecimal(newValueNo);
if(oriValue.compareTo(newValue) == 0) { if(oriValue.compareTo(newValue) == 0) {
continue; continue;
} }
} }
} }
}
//添加ifsRowId ifsRowVersion //添加ifsRowId ifsRowVersion
String ifsRowId = resultMap.get("IFSROWID"); String ifsRowId = resultMap.get("IFSROWID");
String ifsRowVersion = resultMap.get("IFSROWVERSION"); String ifsRowVersion = resultMap.get("IFSROWVERSION");

6
src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java

@ -507,13 +507,11 @@ public class PropertiesServiceImpl implements PropertiesService {
String textValue = propertyValue.getTextValue(); String textValue = propertyValue.getTextValue();
Double numValue = propertyValue.getNumValue(); Double numValue = propertyValue.getNumValue();
String numValueStr = ""; String numValueStr = "";
//null处理
//如果数据为null 且对应的数据类型需要这个数据则跳过当前的循环
if(null == textValue || "".equals(textValue)){ if(null == textValue || "".equals(textValue)){
textValue = ""; textValue = "";
} }
if(null == numValue){
numValue = 0.0;
}else {
if(null != numValue){
numValueStr = String.valueOf(numValue); numValueStr = String.valueOf(numValue);
BigDecimal bd = new BigDecimal(numValueStr).stripTrailingZeros(); BigDecimal bd = new BigDecimal(numValueStr).stripTrailingZeros();
numValueStr = bd.toString(); numValueStr = bd.toString();

Loading…
Cancel
Save