|
|
@ -22,7 +22,12 @@ import com.kms.yxgh.df.domain.DfCheckingProblemV2; |
|
|
|
import com.kms.yxgh.df.domain.DfDangerousTask; |
|
|
|
import com.kms.yxgh.df.domain.DfDangerousTaskItemRel; |
|
|
|
import com.kms.yxgh.df.domain.DfYhV2; |
|
|
|
import com.kms.yxgh.df.mapper.*; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingV2Mapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfDangerousTaskMapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfYhV2Mapper; |
|
|
|
import com.kms.yxgh.df.service.DfCheckingProblemV2Service; |
|
|
|
import com.kms.yxgh.df.service.DfDangerousTaskItemRelService; |
|
|
|
import com.kms.yxgh.df.service.DfDangerousTaskService; |
|
|
@ -658,12 +663,30 @@ public enum StaticIndexEnum { |
|
|
|
BigDecimal qxCount = BigDecimal.valueOf(dfCount + szCount); |
|
|
|
BigDecimal yhCount = BigDecimal.valueOf(yb+jd+zd+lx); |
|
|
|
if (yhCount.longValue()!=0 && qxCount.longValue()!=0){ |
|
|
|
BigDecimal divide = yhCount.divide(qxCount,20, BigDecimal.ROUND_HALF_UP); |
|
|
|
bl = divide.multiply(BigDecimal.valueOf(100)); |
|
|
|
if (qxCount.longValue() >= yhCount.longValue()) { |
|
|
|
BigDecimal divide = yhCount.divide(qxCount, 20, BigDecimal.ROUND_HALF_UP); |
|
|
|
bl = divide.multiply(BigDecimal.valueOf(100)); |
|
|
|
} |
|
|
|
} |
|
|
|
return String.valueOf(bl.longValue()); |
|
|
|
} |
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
|
int yb = 0; |
|
|
|
int jd = 0; |
|
|
|
int zd = 0; |
|
|
|
int lx = 3; |
|
|
|
|
|
|
|
BigDecimal bl = BigDecimal.valueOf(0); |
|
|
|
BigDecimal qxCount = BigDecimal.valueOf(3); |
|
|
|
BigDecimal yhCount = BigDecimal.valueOf(yb + jd + zd + lx); |
|
|
|
if (yhCount.longValue() != 0 && qxCount.longValue() != 0) { |
|
|
|
BigDecimal divide = yhCount.divide(qxCount, 20, BigDecimal.ROUND_HALF_UP); |
|
|
|
bl = divide.multiply(BigDecimal.valueOf(100)); |
|
|
|
} |
|
|
|
System.out.println(String.valueOf(bl.longValue())); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static Map<String, String> dataGroup(List<CountDateDto> list) { |
|
|
|
if (CollectionUtil.isEmpty(list) && list.isEmpty()) { |
|
|
|