小数点、里程

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/BaseInfo.java

@@ -106,6 +106,9 @@ public class BaseInfo  implements  DataModel{
     /**结束桩号*/
     @JSONField(name = "key_26",label="结束桩号",ordinal = 13)
     private String endStation;
+    /**里程信息*/
+    @JSONField(name = "key_27",label="里程信息",ordinal = 13)
+    private String   projectMileage;
 
 /*    @JSONField(name = "key_27",label="动员预付款占合同比例",ordinal = 13)
     private String startRatio="10";

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -1626,7 +1626,7 @@ public class ExecutorMeter extends FormulaExecutor {
                 sis.setFormNumber(itf.getFormNumber());
                 sis.setItemName(itf.getFormName());
                 sis.setUnit(itf.getUnit());
-                sis.setContractTotal(StringUtils.handleNull(itf.getContractTotal()));
+                sis.setContractTotal(BaseUtils.str2BigDecimal(itf.getContractTotal()).stripTrailingZeros().toPlainString());
                 sis.setContractMoney(itf.getContractMoney());
                 sis.setChangeMoney(itf.getChangeMoney());
                 sis.setPrice(itf.getBidPrice());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaDaoImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.service.impl;
 
+import com.mixsmart.utils.CustomFunction;
 import com.mixsmart.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springblade.common.utils.BaseUtils;