From 64668c001f87b9e659aa4332ba08e384bb80bc06 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 29 Dec 2020 14:59:06 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java | 11 +++++++++++ zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 1 + zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 7 +++++++ zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 1 + 4 files changed, 20 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java index 34436ab..458e129 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java @@ -1,8 +1,15 @@ package com.matrix.system.app.action; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @author wzy * @date 2020-12-28 **/ +@Api(value = "ApiStatisticsAction", tags = "报表接口类") +@RestController +@RequestMapping(value = "/api/statistics") public class ApiStatisticsAction { } diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java index 8f9ccf5..38ebab8 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java @@ -24,6 +24,9 @@ @ApiModelProperty(value = "店铺名称") private String shopName; + @ApiModelProperty(value = "员工ID") + private Long id; + public String getShopName() { return shopName; } @@ -55,4 +58,12 @@ public void setAmount(BigDecimal amount) { this.amount = amount; } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } } diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml index 40a75b1..5449871 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml @@ -987,6 +987,7 @@ <select id="selectBeauticianConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo"> select b.su_name name, + b.su_id id, sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) + IFNULL(a.consume, 0)) amount, c.shop_short_name shopName from achieve_new a diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml index ac14a03..3e09a48 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml @@ -580,6 +580,7 @@ <select id="selectStaffSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo"> select b.su_name name, + b.su_id id, b.su_photo photo, sum(ZK_TOTAL) amount, c.shop_short_name shopName -- Gitblit v1.9.1