|
@ -34,6 +34,7 @@ import com.kms.yxgh.sz.service.SzYhV2Service; |
|
|
import com.shuili.common.utils.SpringUtils; |
|
|
import com.shuili.common.utils.SpringUtils; |
|
|
import lombok.Getter; |
|
|
import lombok.Getter; |
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@ -498,18 +499,17 @@ public enum StaticIndexEnum { |
|
|
int zd = getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue()); |
|
|
int zd = getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue()); |
|
|
int lx = getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue()); |
|
|
int lx = getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue()); |
|
|
|
|
|
|
|
|
int qxCount = dfCount + szCount; |
|
|
BigDecimal bl= BigDecimal.valueOf(0); |
|
|
int yhCount = yb+jd+zd+lx; |
|
|
BigDecimal qxCount = BigDecimal.valueOf(dfCount + szCount); |
|
|
|
|
|
BigDecimal yhCount = BigDecimal.valueOf(yb+jd+zd+lx); |
|
|
int bl=0; |
|
|
if (yhCount.longValue()!=0 && qxCount.longValue()!=0){ |
|
|
if (qxCount!=0 && yhCount!=0) { |
|
|
BigDecimal divide = yhCount.divide(qxCount,20, BigDecimal.ROUND_HALF_UP); |
|
|
bl=qxCount/yhCount; |
|
|
bl = divide.multiply(BigDecimal.valueOf(100)); |
|
|
} |
|
|
} |
|
|
return String.valueOf(bl); |
|
|
return String.valueOf(bl.longValue()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static Map<String, String> dataGroup(List<CountDateDto> list) { |
|
|
public static Map<String, String> dataGroup(List<CountDateDto> list) { |
|
|
if (CollectionUtil.isEmpty(list) && list.isEmpty()) { |
|
|
if (CollectionUtil.isEmpty(list) && list.isEmpty()) { |
|
|
return Collections.emptyMap(); |
|
|
return Collections.emptyMap(); |
|
|