Skip to content

I
indicators
Commit 850f686c by hzc
Options

bug修复

parent 1cda7a75
Showing with 3 additions and 3 deletions
src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java
...@@ -402,7 +402,7 @@ public class IndScorecardService { ...@@ -402,7 +402,7 @@ public class IndScorecardService {
double fValue = 0; double fValue = 0;
//是否有绝对值 //是否有绝对值
if(formula.indexOf("ABS")>=0){ if(formula.indexOf("ABS")>=0){
formula.replace("ABS","math.abs"); formula=formula.replace("ABS","math.abs");
} }
//求公式最大值FMAX //求公式最大值FMAX
if(formula.indexOf("FMAX")>=0){ if(formula.indexOf("FMAX")>=0){
...@@ -411,7 +411,7 @@ public class IndScorecardService { ...@@ -411,7 +411,7 @@ public class IndScorecardService {
formulaTmp=sub.substring(0,sub.indexOf(")")+1); formulaTmp=sub.substring(0,sub.indexOf(")")+1);
//formula公式，currentDriveResult结果，true 最大值 //formula公式，currentDriveResult结果，true 最大值
fValue = getFValue(formulaTmp,currentDriveResult,acsType,true); fValue = getFValue(formulaTmp,currentDriveResult,acsType,true);
formula.replace(formulaTmp,String.valueOf(fValue)); formula=formula.replace(formulaTmp,String.valueOf(fValue));
} }
//求公式最小值FMIN //求公式最小值FMIN
if(formula.indexOf("FMIN")>=0){ if(formula.indexOf("FMIN")>=0){
...@@ -420,7 +420,7 @@ public class IndScorecardService { ...@@ -420,7 +420,7 @@ public class IndScorecardService {
formulaTmp=sub.substring(0,sub.indexOf(")")+1); formulaTmp=sub.substring(0,sub.indexOf(")")+1);
//formula公式，currentDriveResult结果，true 最大值 //formula公式，currentDriveResult结果，true 最大值
fValue = getFValue(formulaTmp,currentDriveResult,acsType,false); fValue = getFValue(formulaTmp,currentDriveResult,acsType,false);
formula.replace(formulaTmp,String.valueOf(fValue)); formula=formula.replace(formulaTmp,String.valueOf(fValue));
} }
//解析X,MIN,MAX,AVG //解析X,MIN,MAX,AVG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment