过滤条件0.0000换0.00000000

src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java

@@ -400,7 +400,7 @@ public class IndScorecardService {
 			}else {
 				//获取单位同期比率
 				String rate = CalculateUtils.calGowth(current.getValue(), same.getValue(),"0");//growCalType
-				if(StringUtils.isNotBlank(rate)&&!"0.0000".equals(rate)&&!"NaN".equals(rate)&&!"Infinite".equals(rate)) {
+				if(StringUtils.isNotBlank(rate)&&!"0.00000000".equals(rate)&&!"NaN".equals(rate)&&!"Infinite".equals(rate)) {
 					if("0".equals(acsType)) {
 						if(Double.valueOf(rate)>0) {//同比趋好
 							//加减分操作   0：加分    1：减分

src/main/java/com/keymobile/indicators/service/hytobacco/IndicatorsValueService.java

@@ -512,7 +512,7 @@ public class IndicatorsValueService {
 			row.getCell(5).setCellValue(rate);
 			
 			String acsType = driveIndDef.getIndRule();
-			if(StringUtils.isNotBlank(rateTmp)&&!rateTmp.equals("0.0000")){
+			if(StringUtils.isNotBlank(rateTmp)&&!rateTmp.equals("0.00000000")){
 				if("0".equals(acsType)) {
 					if(Double.valueOf(rateTmp)>0) {
 						row.getCell(6).setCellValue("同比趋好");
@@ -806,7 +806,7 @@ public class IndicatorsValueService {
 			while(it.hasNext()){
 				DriveIndCalResultDef driveCalResult = it.next();
 				if("NaN".equals(driveCalResult.getValue()) || "Infinite".equals(driveCalResult.getValue())
-						||"0.0000".equals(driveCalResult.getValue())||"0".equals(driveCalResult.getValue())){
+						||"0.00000000".equals(driveCalResult.getValue())||"0".equals(driveCalResult.getValue())){
 					it.remove();
 				}
 		    }
@@ -832,7 +832,7 @@ public class IndicatorsValueService {
 			while(sit.hasNext()){
 				DriveIndCalResultDef driveCalResult = sit.next();
 				if("NaN".equals(driveCalResult.getValue()) || "Infinite".equals(driveCalResult.getValue())
-						||"0.0000".equals(driveCalResult.getValue())||"0".equals(driveCalResult.getValue())){
+						||"0.00000000".equals(driveCalResult.getValue())||"0".equals(driveCalResult.getValue())){
 					sit.remove();
 				}
 		    }

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardRuleService.java

@@ -267,7 +267,7 @@ public class ShortboardRuleService {
 				//判断规则选择是大于还是小于
 				if("0".equals(shortboardItem.getCalType())) {//大于
 					if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
-							&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
+							&& !"0.00000000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 						//判断有没有实际的平均值
 
 						if(calResult.getActualAverage()!=null&&!"0.0".equals(calResult.getActualAverage())) {
@@ -284,7 +284,7 @@ public class ShortboardRuleService {
 					}
 				}else {//小于
 					if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
-							&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
+							&& !"0.00000000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 						//判断有没有实际的平均值
 						if(calResult.getActualAverage()!=null&&!"0.0".equals(calResult.getActualAverage())) {
 							if(Double.parseDouble(calResult.getValue()) < 
@@ -376,7 +376,7 @@ public class ShortboardRuleService {
 			if(maxValue!=null && StringUtils.isNotBlank(shortboardItem.getValue())) {
 				for(DriveIndCalResultDef calResult : calResults) {
 					if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
-							&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
+							&& !"0.00000000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 						if(StringUtils.isNotBlank(shortboardItem.getValue())) {
 							//判断是比较差还是百分比
 							if("0".equals(shortboardItem.getAnalysisType())) {//绝对值
@@ -432,7 +432,7 @@ public class ShortboardRuleService {
 			if(minValue!=null && StringUtils.isNotBlank(shortboardItem.getValue())) {
 				for(DriveIndCalResultDef calResult : calResults) {
 					if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
-							&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
+							&& !"0.00000000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 						if(StringUtils.isNotBlank(shortboardItem.getValue())) {
 							//判断是比较差还是百分比
 							if("0".equals(shortboardItem.getAnalysisType())) {//绝对值
@@ -475,7 +475,7 @@ public class ShortboardRuleService {
 		if(!calResults.isEmpty()) {
 			for(DriveIndCalResultDef calResult : calResults) {
 				if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
-						&& !"0.0000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
+						&& !"0.00000000".equals(calResult.getValue()) && !"0".equals(calResult.getValue())) {
 					filterCalResults.add(calResult);
 				}
 			}

src/main/java/com/keymobile/indicators/service/report/IndexReportService.java

@@ -66,7 +66,7 @@ public class IndexReportService {
 							if(!"0".equals(growCalType)){
 								rateTmp= CalculateUtils.calGowth(calResults.get(0).getValue(), sameResult.getValue(), "0");
 							}
-							if(StringUtils.isNotBlank(indRule) && StringUtils.isNotBlank(rateTmp)&&!"0.0000".equals(rateTmp)) {
+							if(StringUtils.isNotBlank(indRule) && StringUtils.isNotBlank(rateTmp)&&!"0.00000000".equals(rateTmp)) {
 								if("0".equals(indRule)) {//正向
 									if(Double.parseDouble(rate)>0) {
 										indMap.put("trend", "1");//趋好

src/main/java/com/keymobile/indicators/utils/CalculateUtils.java

@@ -163,7 +163,7 @@ public class CalculateUtils {
 			for(int i=0;i<values.size();i++) {
 				if(type==0) {
 					if("NaN".equals(values.get(i)) || "Infinite".equals(values.get(i))
-							|| "0.0000".equals(values.get(i)) || "0".equals(values.get(i))
+							|| "0.00000000".equals(values.get(i)) || "0".equals(values.get(i))
 							|| StringUtils.isBlank(values.get(i))) {
 						size -= 1;
 						continue;