|
@@ -122,7 +122,7 @@ public class EnvFactory {
|
|
|
Double envComplianceRate = environmentWebService.getEnvComplianceRate(projectId, date, envDefine);
|
|
|
String envComplianceRateStr = envComplianceRate == null ? null : String.valueOf(envComplianceRate);
|
|
|
return new AttrValueVO(ProjectEnvContentCodes.complianceRate.name(),
|
|
|
- envComplianceRateStr, AttrValueTypeEnum.number_2, DataConstants.PERCENT);
|
|
|
+ envComplianceRateStr, AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -189,11 +189,11 @@ public class EnvFactory {
|
|
|
public AttrValueVO getHandleProportion(Double handledCount, Double totalCount) {
|
|
|
if (handledCount == null || totalCount == null) {
|
|
|
return new AttrValueVO(ProjectEnvContentCodes.handleProportion.name(),
|
|
|
- null, AttrValueTypeEnum.number_2, DataConstants.PERCENT);
|
|
|
+ null, AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
|
|
|
}
|
|
|
Double proportion = DataUtils.doubleDivide(handledCount, totalCount);
|
|
|
return new AttrValueVO(ProjectEnvContentCodes.handleProportion.name(),
|
|
|
- String.valueOf(proportion), AttrValueTypeEnum.number_2, DataConstants.PERCENT);
|
|
|
+ String.valueOf(proportion), AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -235,7 +235,7 @@ public class EnvFactory {
|
|
|
*/
|
|
|
public AttrValueVO getQualifiedStandard(Function function) {
|
|
|
return new AttrValueVO(ProjectEnvContentCodes.complianceRateQualifiedStandard.name(),
|
|
|
- getQualifiedStandardValue(function), AttrValueTypeEnum.str);
|
|
|
+ getQualifiedStandardValue(function), AttrValueTypeEnum.percent, DataConstants.PERCENT);
|
|
|
}
|
|
|
|
|
|
/**
|