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 9d84fe4..22f897b 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 @@ -193,5 +193,9 @@ public interface DevInfoMapper { DevInfo getDevStatus(DevInfoVo devInfoVo); Integer getTodayDevCount(); + + Integer getDevNum(); + + Integer getDevUpNum(); } 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 c8c0cd1..a861d13 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 @@ -61,11 +61,23 @@ public class LargeScreenController { Integer leaseNum = leaseInfoMapper.getTodayLeaseCount(); //今日需求接单数 Integer leaseOrderNum = leaseInfoMapper.getTodayLeaseOderCount(); - orderData.setDevNum(devCount); - orderData.setOrderNum(orderDto.getOrderNum()); - orderData.setCost(orderDto.getCost()); - orderData.setLeaseNum(leaseNum); - orderData.setLeaseOrderNum(leaseOrderNum); + orderData.setTodayDevNum(devCount); + orderData.setTodayOrderNum(orderDto.getOrderNum()); + orderData.setTodayCost(orderDto.getCost()); + orderData.setTodayLeaseNum(leaseNum); + orderData.setTodayLeaseOrderNum(leaseOrderNum); + return AjaxResult.success(orderData); + } + + @ApiOperation("装备上架") + @GetMapping("/devCount") + public AjaxResult devCount() { + //今日装备入驻数 + Integer devNum = devInfoMapper.getDevNum(); + Integer devUpNum = devInfoMapper.getDevUpNum(); + OrderData orderData = new OrderData(); + orderData.setDevNum(devNum); + orderData.setDevUpNum(devUpNum); return AjaxResult.success(orderData); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java index cbc6688..3c3ca7a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java @@ -12,27 +12,33 @@ import java.math.BigDecimal; @Data public class OrderData { - @ApiModelProperty(value = "订单总数") - private Integer orderNum; - @ApiModelProperty(value = "订单金额") private BigDecimal orderCosts; @ApiModelProperty(value = "所属公司id") private Integer ownCo; - @ApiModelProperty(value = "公司订单金额") - private BigDecimal cost; - @ApiModelProperty(value = "公司名称") private String companyName; + @ApiModelProperty(value = "今日订单总数") + private Integer todayOrderNum; + + @ApiModelProperty(value = "今日公司订单金额") + private BigDecimal todayCost; + @ApiModelProperty(value = "今日发布需求数") - private Integer leaseNum; + private Integer todayLeaseNum; @ApiModelProperty(value = "今日需求接单数") - private Integer leaseOrderNum; + private Integer todayLeaseOrderNum; @ApiModelProperty(value = "今日装备入驻数") + private Integer todayDevNum; + + @ApiModelProperty(value = "装备总入驻数") private Integer devNum; + + @ApiModelProperty(value = "装备总上架数") + private Integer devUpNum; } 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 b0655cc..f14969b 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 @@ -889,4 +889,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ma_status != 0 + + + +