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 2a5dcb9..d72c41d 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 @@ -7,6 +7,7 @@ import com.bonus.material.device.mapper.DevInfoMapper; import com.bonus.material.device.service.DevInfoService; import com.bonus.material.largeScreen.entity.OrderData; import com.bonus.material.largeScreen.entity.OrderDto; +import com.bonus.material.lease.domain.MaLeaseInfo; import com.bonus.material.lease.mapper.MaLeaseInfoMapper; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; @@ -79,52 +80,6 @@ public class LargeScreenController { return AjaxResult.success(groupedList.get(randomValue)); } - @ApiOperation("装备共享排名") - @GetMapping("/getDeviceShareRanking") - public AjaxResult getDeviceShareRanking() { - List list = devInfoMapper.getDeviceShareRanking(); - return AjaxResult.success(list); - } - - @ApiOperation("租赁跟踪") - @GetMapping("/getOrderTracking") - public AjaxResult getOrderTracking() { - List list = orderMapper.getOrderStatusCount(new OrderDetailDto()); - return AjaxResult.success(list); - } - - @ApiOperation("订单数据") - @GetMapping("/orderData") - public AjaxResult getOrderData() { - return AjaxResult.success(orderService.getOrderData()); - } - - @ApiOperation("各单位租金排行") - @GetMapping("/comCost") - public AjaxResult getCompanysCost() { - return AjaxResult.success(orderService.getCompanysCost()); - } - - @ApiOperation("今日装备入驻数、今日订单成交数、今日成交金额数、今日需求发布数、今日需求接单数") - @GetMapping("/todayCount") - public AjaxResult getTodayCount() { - //今日装备入驻数 - Integer devCount = devInfoMapper.getTodayDevCount(); - OrderData orderData = new OrderData(); - //今日订单成交数、今日成交金额数 - OrderDto orderDto = orderMapper.getTodayOrderCount(); - // 今日需求发布数 - Integer leaseNum = leaseInfoMapper.getTodayLeaseCount(); - //今日需求接单数 - Integer leaseOrderNum = leaseInfoMapper.getTodayLeaseOrderCount(); - 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() { @@ -168,4 +123,57 @@ public class LargeScreenController { return AjaxResult.success(orderData); } + @ApiOperation("装备共享排名") + @GetMapping("/getDeviceShareRanking") + public AjaxResult getDeviceShareRanking() { + List list = devInfoMapper.getDeviceShareRanking(); + return AjaxResult.success(list); + } + + @ApiOperation("租赁跟踪") + @GetMapping("/getOrderTracking") + public AjaxResult getOrderTracking() { + List list = orderMapper.getOrderStatusCount(new OrderDetailDto()); + return AjaxResult.success(list); + } + + @ApiOperation("租赁需求分析") + @GetMapping("/getLeaseCountByPublishCompany") + public AjaxResult getLeaseCountByPublishCompany() { + List list = leaseInfoMapper.getLeaseCountByPublishCompany(); + return AjaxResult.success(list); + } + +// @ApiOperation("订单数据") +// @GetMapping("/orderData") +// public AjaxResult getOrderData() { +// return AjaxResult.success(orderService.getOrderData()); +// } +// +// @ApiOperation("各单位租金排行") +// @GetMapping("/comCost") +// public AjaxResult getCompanysCost() { +// return AjaxResult.success(orderService.getCompanysCost()); +// } +// +// @ApiOperation("今日装备入驻数、今日订单成交数、今日成交金额数、今日需求发布数、今日需求接单数") +// @GetMapping("/todayCount") +// public AjaxResult getTodayCount() { +// //今日装备入驻数 +// Integer devCount = devInfoMapper.getTodayDevCount(); +// OrderData orderData = new OrderData(); +// //今日订单成交数、今日成交金额数 +// OrderDto orderDto = orderMapper.getTodayOrderCount(); +// // 今日需求发布数 +// Integer leaseNum = leaseInfoMapper.getTodayLeaseCount(); +// //今日需求接单数 +// Integer leaseOrderNum = leaseInfoMapper.getTodayLeaseOrderCount(); +// orderData.setTodayDevNum(devCount); +// orderData.setTodayOrderNum(orderDto.getOrderNum()); +// orderData.setTodayCost(orderDto.getCost()); +// orderData.setTodayLeaseNum(leaseNum); +// orderData.setTodayLeaseOrderNum(leaseOrderNum); +// return AjaxResult.success(orderData); +// } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java index a3af2f8..6dd8c9b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java @@ -127,4 +127,6 @@ public interface MaLeaseInfoMapper { MaLeaseInfo getDevInfoById(Integer id); List getLeaseStatusCount(MaLeaseInfo info); + + List getLeaseCountByPublishCompany(); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index ece0e15..d38a3c4 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -487,4 +487,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) a group by a.lease_status + + \ No newline at end of file