From 3ffad8d12dd46e83ca5dec9025c6ea7e7cec1258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Mon, 17 Mar 2025 00:06:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?edit:=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/common/enums/StaticIndexEnum.java | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 8850a600..b913fa5f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -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 dataGroup(List list) { if (CollectionUtil.isEmpty(list) && list.isEmpty()) { From da4eff115d97a8f4415ffb436e1b8615f2fc9156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Mon, 17 Mar 2025 00:17:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index b913fa5f..a93cbb1d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -648,9 +648,11 @@ public enum StaticIndexEnum { DfYhV2Service dfYhV2Service = SpringUtils.getBean(DfYhV2Service.class); SzYhV2Service szYhV2Service = SpringUtils.getBean(SzYhV2Service.class); int dfCount = dfYhV2Service.count(new LambdaQueryWrapper() + .eq(DfYhV2::getStatus, DfYhV2StatusEnum.ACCEPTED.getValue()) .ge(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getStartTime()) .le(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getEndTime())); int szCount = szYhV2Service.count(new LambdaQueryWrapper() + .eq(SzYhV2::getStatus, DfYhV2StatusEnum.ACCEPTED.getValue()) .ge(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getStartTime()) .le(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getEndTime()));