diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionOrderServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionOrderServiceImpl.java index 58762d6..1cdf022 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionOrderServiceImpl.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionOrderServiceImpl.java @@ -106,6 +106,7 @@ public class OpsInspectionOrderServiceImpl implements IOpsInspectionOrderService lqw.eq(StringUtils.isNotBlank(bo.getLevel()), OpsInspectionOrder::getLevel, bo.getLevel()); lqw.eq(StringUtils.isNotBlank(bo.getPoint()), OpsInspectionOrder::getPoint, bo.getPoint()); lqw.eq(bo.getCreateTime() != null, OpsInspectionOrder::getCreateTime, bo.getCreateTime()); + lqw.eq(bo.getStatus() != null, OpsInspectionOrder::getStatus, bo.getStatus()); return lqw; } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java index 21fa1b0..acf865a 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java @@ -266,9 +266,13 @@ public class OpsInspectionReportServiceImpl implements IOpsInspectionReportServi } } time = TimeUnit.MILLISECONDS.toMinutes(time); - BigDecimal divide1 = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(thisMonth.size()), 0, RoundingMode.HALF_UP); - long hours = TimeUnit.MINUTES.toHours(Long.parseLong(divide1.toString())); - + long hours; + if (thisMonth.size() != 0) { + BigDecimal divide1 = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(thisMonth.size()), 0, RoundingMode.HALF_UP); + hours = TimeUnit.MINUTES.toHours(Long.parseLong(divide1.toString())); + }else { + hours = 0; + } //平均处理时长 recordVo.setPjclsc(Long.toString(hours));