kangwei：设备运行台时问题修改

@@ -27,6 +27,10 @@ public class JSUtils {
         String expression =  obj1+ "-" + obj2;
         String expression =  obj1+ "-" + obj2;
         return executeExpression(expression,"0.00");
         return executeExpression(expression,"0.00");
     }
     }
+    public static String subtract(Object obj1 , Object obj2,Object obj3){
+        String expression =  obj1+ "-" + obj2 + "-" + obj3 ;
+        return executeExpression(expression,"0.00");
+    }
     public static String multiply(Object obj1 , Object obj2){
     public static String multiply(Object obj1 , Object obj2){
         String expression =  obj1+ "*" + obj2;
         String expression =  obj1+ "*" + obj2;
         return executeExpression(expression,"0.00");
         return executeExpression(expression,"0.00");

 package com.skua.modules.algorithm.vo;
 package com.skua.modules.algorithm.vo;
 
 
+import com.skua.core.util.ConvertUtils;
+import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import netscape.javascript.JSUtil;
 
 
 @Data
 @Data
 @ApiModel(value="指挥中心:运行负荷率分析:处理水量详情", description="指挥中心:运行负荷率分析:处理水量详情)")
 @ApiModel(value="指挥中心:运行负荷率分析:处理水量详情", description="指挥中心:运行负荷率分析:处理水量详情)")
@@ -25,35 +28,35 @@ public class WaterTreatmentVO {
     private Double dayCsl;
     private Double dayCsl;
 
 
     @ApiModelProperty(value = "环比：处理水量比例")
     @ApiModelProperty(value = "环比：处理水量比例")
-    private Double hbcslbl;
+    private String hbcslbl;
     @ApiModelProperty(value = "同比：处理水量比例")
     @ApiModelProperty(value = "同比：处理水量比例")
-    private Double tbcslbl;
+    private String tbcslbl;
 
 
     @ApiModelProperty(value = "负荷率")
     @ApiModelProperty(value = "负荷率")
-    private Double fhl;
+    private String fhl;
 
 
     @ApiModelProperty(value = "排名")
     @ApiModelProperty(value = "排名")
     private Integer rank;
     private Integer rank;
 
 
     private long monthDayNum = 30;
     private long monthDayNum = 30;
 
 
-    public Double getFhl() {
+    public String getFhl() {
         if(this.getCSL() != null && this.getProScale() != null && this.getProScale().doubleValue() > 0 ){
         if(this.getCSL() != null && this.getProScale() != null && this.getProScale().doubleValue() > 0 ){
-            fhl =   this.getCSL()*100  / (this.getProScale() * this.getMonthDayNum() );
+            fhl = JSUtils.format(  this.getCSL()*100  / (this.getProScale() * this.getMonthDayNum() ) );
         }
         }
         return fhl;
         return fhl;
     }
     }
 
 
-    public Double getHbcslbl() {
+    public String getHbcslbl() {
         if(this.getCSL() != null && this.getHbcsl() != null &&  this.getHbcsl().doubleValue() > 0){
         if(this.getCSL() != null && this.getHbcsl() != null &&  this.getHbcsl().doubleValue() > 0){
-            hbcslbl = (this.getCSL() - this.getHbcsl()) * 100 / this.getHbcsl() ;
+            hbcslbl = JSUtils.format( (this.getCSL() - this.getHbcsl()) * 100 / this.getHbcsl());
         }
         }
         return hbcslbl;
         return hbcslbl;
     }
     }
 
 
-    public Double getTbcslbl() {
+    public String getTbcslbl() {
         if(this.getCSL() != null && this.getTbcsl() != null &&  this.getTbcsl().doubleValue() > 0){
         if(this.getCSL() != null && this.getTbcsl() != null &&  this.getTbcsl().doubleValue() > 0){
-            tbcslbl = (this.getCSL() - this.getTbcsl())*100 / this.getTbcsl() ;
+            tbcslbl = JSUtils.format( (this.getCSL() - this.getTbcsl())*100 / this.getTbcsl());
         }
         }
         return tbcslbl;
         return tbcslbl;
     }
     }