diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java index 7d8a456b..d5427732 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcStatisticsController.java @@ -240,7 +240,7 @@ public class XhpcStatisticsController extends BaseController { * @return */ @GetMapping("/getMechanismPage") - public TableDataInfo getMechanismPage(HttpServletRequest request,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type,@RequestParam("source")Integer source) + public TableDataInfo getMechanismPage(HttpServletRequest request,String chargingStationIds,Long internetUserId, Long operatorId,String startTime, String endTime, @RequestParam("userId") Long userId, @RequestParam("type")Integer type,Integer source) { List> list = xhpcStatisticsService.getMechanismPage(request,chargingStationIds,internetUserId,operatorId,startTime,endTime,userId,type,source); return getDataTable(list); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml index 0e086bf7..fb61e8ce 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml @@ -448,7 +448,7 @@ "B端用户" ELSE "未知用户" - END typeName + END sourceName from xhpc_statistics_station where del_flag=0 and type=2 @@ -478,8 +478,7 @@ and tenant_id = #{tenantId} - group by DATE_FORMAT(create_time,'%Y-%m-%d') - order by DATE_FORMAT(create_time,'%Y-%m-%d') desc + group by source