From e1df8bf961908009350b5b786699c5ff7803f8d3 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 7 Jan 2025 18:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/largeScreen/controller/LargeScreenController.java | 2 +- .../src/main/resources/mapper/material/device/DevInfoMapper.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java index 03f8f69..faa8996 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java @@ -113,7 +113,7 @@ public class LargeScreenController { Integer repairingDevNum = devInfoMapper.getRepairingDevNum(); orderData.setDevRepairingNum(repairingDevNum); DevInfo devInfo = devInfoMapper.getDevUsageRatio(); - orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay())); + orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay() + devInfo.getTotalLeaseDay())); return AjaxResult.success(orderData); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 9e57d58..44f5963 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -977,8 +977,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(total_lease_day) as totalLeaseDay FROM ma_dev_info - WHERE - ma_status = '3'