bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏bug

This commit is contained in:
sxu 2025-01-07 17:40:32 +08:00
parent 11534b3436
commit 93996d1853
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
View File

@ -202,6 +202,8 @@ public interface DevInfoMapper {
Integer getDevLeasingNum(); Integer getDevLeasingNum();
Integer getRepairingDevNum();
Integer getDevTypeNum(); Integer getDevTypeNum();
Integer getDevQcWarningNum(); Integer getDevQcWarningNum();

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
View File

@ -108,6 +108,8 @@ public class LargeScreenController {
orderData.setOrderNum(orderDto.getOrderNum()); orderData.setOrderNum(orderDto.getOrderNum());
Integer devLeasingNum = devInfoMapper.getDevLeasingNum(); Integer devLeasingNum = devInfoMapper.getDevLeasingNum();
orderData.setDevLeasingNum(devLeasingNum); orderData.setDevLeasingNum(devLeasingNum);
Integer repairingDevNum = devInfoMapper.getRepairingDevNum();
orderData.setDevRepairingNum(repairingDevNum);
DevInfo devInfo = devInfoMapper.getDevUsageRatio(); DevInfo devInfo = devInfoMapper.getDevUsageRatio();
orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay())); orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay()));
return AjaxResult.success(orderData); return AjaxResult.success(orderData);

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java
View File

@ -52,6 +52,9 @@ public class OrderData {
@ApiModelProperty(value = "装备总在租数") @ApiModelProperty(value = "装备总在租数")
private Integer devLeasingNum; private Integer devLeasingNum;
@ApiModelProperty(value = "装备在修数量")
private Integer devRepairingNum;
@ApiModelProperty(value = "装备总类型数") @ApiModelProperty(value = "装备总类型数")
private Integer devTypeNum; private Integer devTypeNum;

6
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
View File

@ -935,6 +935,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND ma_status = '3' AND ma_status = '3'
</select> </select>
<select id="getRepairingDevNum" resultType="java.lang.Integer">
select count(1)
from lease_repair_record lrr
LEFT JOIN ma_order_details modd on modd.order_id=lrr.order_id
where IFNULL(lrr.repair_num,0) > 0 and modd.order_status &lt; 20
</select>
<select id="getDevTypeNum" resultType="java.lang.Integer"> <select id="getDevTypeNum" resultType="java.lang.Integer">
SELECT SELECT