|
@@ -341,18 +341,18 @@ public class ProjectInfoPdscServiceImpl extends ServiceImpl<ProjectInfoPdscMappe
|
|
BigDecimal minValue = actualPerformanceVo.getMinValue();
|
|
BigDecimal minValue = actualPerformanceVo.getMinValue();
|
|
if (ObjectUtil.isNotNull(yellowUpper) && ObjectUtil.isNotNull(greenUpper) && ObjectUtil.isNotNull(yellowLower)
|
|
if (ObjectUtil.isNotNull(yellowUpper) && ObjectUtil.isNotNull(greenUpper) && ObjectUtil.isNotNull(yellowLower)
|
|
&& ObjectUtil.isNotNull(greenLower) && ObjectUtil.isNotNull(maxValue) && ObjectUtil.isNotNull(minValue)) {
|
|
&& ObjectUtil.isNotNull(greenLower) && ObjectUtil.isNotNull(maxValue) && ObjectUtil.isNotNull(minValue)) {
|
|
- Integer upperColor = 1;
|
|
|
|
- if (maxValue.compareTo(greenUpper) < 0 && maxValue.compareTo(greenUpper) == 0) {
|
|
|
|
|
|
+ int upperColor = 1;
|
|
|
|
+ if (maxValue.compareTo(greenUpper) < 1) {
|
|
upperColor = 1;
|
|
upperColor = 1;
|
|
- } else if (maxValue.compareTo(yellowUpper) < 0 && maxValue.compareTo(yellowUpper) == 0) {
|
|
|
|
|
|
+ } else if (maxValue.compareTo(yellowUpper) < 1) {
|
|
upperColor = 2;
|
|
upperColor = 2;
|
|
} else if (maxValue.compareTo(yellowUpper) > 0) {
|
|
} else if (maxValue.compareTo(yellowUpper) > 0) {
|
|
upperColor = 3;
|
|
upperColor = 3;
|
|
}
|
|
}
|
|
- Integer lowerColor = 1;
|
|
|
|
- if (minValue.compareTo(greenLower) > 0 && minValue.compareTo(greenLower) == 0) {
|
|
|
|
|
|
+ int lowerColor = 1;
|
|
|
|
+ if (minValue.compareTo(greenLower) > -1) {
|
|
lowerColor = 1;
|
|
lowerColor = 1;
|
|
- } else if (minValue.compareTo(yellowLower) > 0 && minValue.compareTo(yellowLower) == 0) {
|
|
|
|
|
|
+ } else if (minValue.compareTo(yellowLower) > -1) {
|
|
lowerColor = 2;
|
|
lowerColor = 2;
|
|
} else if (minValue.compareTo(yellowLower) < 0) {
|
|
} else if (minValue.compareTo(yellowLower) < 0) {
|
|
lowerColor = 3;
|
|
lowerColor = 3;
|