From 6dbefbb50c62e6b16ab851bb0f7f77da9321d206 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 18 Jan 2021 18:01:13 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 15 ++++++--------- zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 27 ++++++++++++++++++++++++++- zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java | 2 ++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java index 5a4b4fe..f3d4d1f 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java @@ -59,18 +59,15 @@ @PostMapping(value = "/findShopAchieveRanking") public AjaxResult findShopAchieveRanking(@RequestBody RankingDto rankingDto) { AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(""); + AchieveNew achieveNew = new AchieveNew(); + QueryUtil.setQueryLimitCom(achieveNew); + achieveNew.setT1(rankingDto.getType()); + achieveNew.setDatatime(new Date()); + if (RankingDto.SALE.equals(rankingDto.getDataType())) { - AchieveNew achieveNew = new AchieveNew(); - QueryUtil.setQueryLimitCom(achieveNew); - achieveNew.setType(rankingDto.getType()); - achieveNew.setDatatime(new Date()); - List<RankingVo> list = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew); + List<RankingVo> list = achieveNewDao.selectShopSaleAchieveRanking(achieveNew); ajaxResult.setRows(list); } else { - AchieveNew achieveNew = new AchieveNew(); - QueryUtil.setQueryLimitCom(achieveNew); - achieveNew.setDatatime(new Date()); - achieveNew.setT1(rankingDto.getType()); List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew); ajaxResult.setRows(rankingVos); } diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java index 90d9a2e..46ee09f 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java @@ -66,6 +66,8 @@ List<RankingVo> selectShopConsumeAchieveRanking(@Param("record") AchieveNew achieveNew); + List<RankingVo> selectShopSaleAchieveRanking(@Param("record") AchieveNew achieveNew); + List<RankingVo> selectBeauticianConsumeAchieveRanking(@Param("record") AchieveNew achieveNew); List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId); 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 d6f90e1..48bb959 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml @@ -964,7 +964,7 @@ select b.shop_short_name name, b.SHOP_IMAG photo, - sum(IFNULL(a.free_consume,0) + IFNULL(a.consume,0) + IFNULL(a.his_consume,0)) amount + sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume,0)) amount from achieve_new a left join sys_shop_info b on a.shop_id=b.ID <where> @@ -1060,4 +1060,29 @@ group by b.su_id order by amount desc, b.su_id </select> + + <select id="selectShopSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo"> + select + b.shop_short_name name, + b.SHOP_IMAG photo, + sum(IFNULL(a.consume,0) + IFNULL(a.card_cash,0)) amount + from achieve_new a + left join sys_shop_info b on a.shop_id=b.ID + <where> + <if test="record.companyId != null"> + and a.company_id=#{record.companyId} + </if> + <if test='record.t1 == "1" and record.datatime != null'> + and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d') + </if> + <if test='record.t1 == "2" and record.datatime != null'> + and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m') + </if> + <if test='record.t1 == "3" and record.datatime != null'> + and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y') + </if> + </where> + group by a.shop_id + order by amount desc, a.shop_id + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.1