From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期二, 18 二月 2020 12:50:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java index d6fc927..a344766 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import org.yeshi.utils.DateUtil; @@ -168,6 +169,15 @@ return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime); } + + + @Override + public Integer countOrderByTypeAndDate(Integer orderType, String preDay) { + return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay); + } + + + @Override public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime, String endTime) throws Exception { -- Gitblit v1.8.0