modify

Helius

2020-12-29 64668c001f87b9e659aa4332ba08e384bb80bc06

modify

 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 {
}

 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;
    }
}

 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

 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