diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index bba502b..7e090e3 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -299,4 +299,10 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "使用率小于30") private Integer idle30; + + @ApiModelProperty(value = "承租方") + private String lessee; + + @ApiModelProperty(value = "承租方联系人") + private String lesseePerson; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 8de6014..96177ec 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -170,5 +171,7 @@ public class DevInfoVo extends DevInfo { private Long orderId; + @ApiModelProperty(value = "订单金额") + private BigDecimal cost; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 0f3d43c..3569eec 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -250,5 +250,17 @@ public interface DevInfoMapper { * @return */ DevInfoVo selectDevTypeByName(String typeName); + + List getDevNumList(DevInfoVo devInfoVo); + + List getDevUpNumList(DevInfoVo devInfoVo); + + List getDevTypeNumList(DevInfoVo devInfoVo); + + List getDevQcWarningNumList(DevInfoVo devInfoVo); + + List getMaTypeLeasingNumList(DevInfoVo devInfoVo); + + List getDevLeasingNumList(DevInfoVo devInfoVo); } 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 6908f8b..11cd94f 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 @@ -35,6 +35,8 @@ import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; +import static com.bonus.common.core.utils.PageUtils.startPage; + /** * @Author:liang.chao * @Date:2024/12/24 - 15:46 @@ -219,6 +221,54 @@ public class LargeScreenController extends BaseController { return AjaxResult.success(infoVos); } + @ApiOperation("入住装备数二级页面") + @GetMapping("/getDevNum") + public AjaxResult getDevNum(DevInfoVo devInfoVo) { + startPage(); + List list = devInfoMapper.getDevNumList(devInfoVo); + return AjaxResult.success(list); + } + + @ApiOperation("上架装备数二级页面") + @GetMapping("/getDevUpNum") + public AjaxResult getDevUpNum(DevInfoVo devInfoVo) { + startPage(); + List list = devInfoMapper.getDevUpNumList(devInfoVo); + return AjaxResult.success(list); + } + + @ApiOperation("装备总类型数二级页面") + @GetMapping("/getDevTypeNum") + public AjaxResult getDevTypeNum(DevInfoVo devInfoVo) { + startPage(); + List list = devInfoMapper.getDevTypeNumList(devInfoVo); + return AjaxResult.success(list); + } + + @ApiOperation("保养告警二级页面") + @GetMapping("/getDevQcWarningNum") + public AjaxResult getDevQcWarningNum(DevInfoVo devInfoVo) { + startPage(); + List list = devInfoMapper.getDevQcWarningNumList(devInfoVo); + return AjaxResult.success(list); + } + + @ApiOperation("在租赁种类二级页面") + @GetMapping("/getMaTypeLeasingNum") + public AjaxResult getMaTypeLeasingNum(DevInfoVo devInfoVo) { + startPage(); + List list = devInfoMapper.getMaTypeLeasingNumList(devInfoVo); + return AjaxResult.success(list); + } + + @ApiOperation("在租赁装备数二级页面") + @GetMapping("/getDevLeasingNum") + public AjaxResult getDevLeasingNum(DevInfoVo devInfoVo) { + startPage(); + List list = devInfoMapper.getDevLeasingNumList(devInfoVo); + return AjaxResult.success(list); + } + // @ApiOperation("订单数据") // @GetMapping("/orderData") // public AjaxResult getOrderData() { 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 daf4887..6294d87 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 @@ -986,8 +986,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" COUNT(1) FROM ma_dev_qc mdc - left join ma_dev_info mdi on mdi.ma_id = mdc.ma_id - left join sys_dept sd on mdc.qc_com = sd.dept_id where mdc.next_check_time < now() @@ -1209,4 +1207,121 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND `level` = '4' AND del_flag = '0' + + + + + +