From 3bf9ed41222d3291a99d513a34fddae3c4fe0819 Mon Sep 17 00:00:00 2001 From: king Date: Mon, 27 Apr 2026 11:52:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E7=BB=B4=E5=BA=A6=E4=B8=8E=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E5=85=B3=E8=81=94=E5=8F=96?= =?UTF-8?q?=E6=B6=88=20=E8=BD=AC=E7=A7=BB=E8=A1=A8=E5=88=B0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewGrBiSaAggMonthCountMapper.xml | 398 +++++++++--------- .../framework/NewGrBiSaAggYearCountMapper.xml | 84 ++-- 2 files changed, 241 insertions(+), 241 deletions(-) diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml index 60b4c0c..2f8c92e 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml @@ -270,27 +270,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{saAggParam.useYearEnd} as useYearEnd, #{saAggParam.useMonthStart} as useMonthStart, #{saAggParam.useMonthEnd} as useMonthEnd, - + current_month.custom_id, current_month.custom_name, - + current_month.zone_id, current_month.zone_name, - + current_month.sale_type_id, current_month.sale_type_name, - + current_month.saler_id, current_month.saler_name, - + current_month.dosage_id, current_month.dosage_name, - + current_month.std_goods_name, current_month.this_month_sa_qty AS this_month_sa_qty, @@ -351,32 +351,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ( SELECT - + custom_id, custom_name , - + std_goods_name, - + zone_id, zone_name, - + sale_type_id, sale_type_name, - + dosage_id, dosage_name, - - saler_id, - saler_name, - + + saler_id, + saler_name, + ifnull(sum(this_month_sa_qty), 0) AS this_month_sa_qty, ifnull(sum(this_month_sa_money), 0) AS this_month_sa_money, ifnull(sum(this_month_cost), 0) AS this_month_cost, @@ -430,26 +430,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY - + custom_id, custom_name , - + std_goods_name, - + zone_id, zone_name, - + sale_type_id, sale_type_name, - + dosage_id, dosage_name, - + saler_id, saler_name, @@ -458,22 +458,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ( SELECT - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + saler_id, ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty, @@ -528,43 +528,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + saler_id, ) yoy_month ON - + AND yoy_month.custom_id = current_month.custom_id - + AND yoy_month.std_goods_name = current_month.std_goods_name - + AND yoy_month.zone_id = current_month.zone_id - + AND yoy_month.sale_type_id = current_month.sale_type_id - + AND yoy_month.dosage_id = current_month.dosage_id - + AND yoy_month.saler_id = current_month.saler_id @@ -580,49 +580,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (use_year * 100 + use_month) >= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart}) AND (use_year * 100 + use_month) <= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd}) ) total_month_data - - and current_month.zone_name in - - #{name} - - - and current_month.sale_type_name in - - #{name} - - - and current_month.custom_name in - - #{name} - - - and current_month.dosage_name in - - #{name} - - - and current_month.goods_name in - - #{name} - - - and current_month.province_name in - - #{name} - - - and current_month.saler_name in - - #{name} - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - and current_month.std_goods_name in - - #{name} - - - + + + + + + @@ -638,31 +638,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LPAD(current_month.use_month, 2, '0') as ny, - + current_month.custom_id, current_month.custom_name, - + current_month.zone_id, current_month.zone_name, - + current_month.sale_type_id, current_month.sale_type_name, - + current_month.saler_id, current_month.saler_name, - + current_month.dosage_id, current_month.dosage_name, - + current_month.effect_id, current_month.effect_name, - + current_month.std_goods_name, current_month.this_month_sa_qty AS this_month_sa_qty, @@ -739,32 +739,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_year, use_month, - + custom_id, custom_name , - + std_goods_name, - + zone_id, zone_name, - + sale_type_id, sale_type_name, - + dosage_id, dosage_name, - + effect_id, effect_name, - + saler_id, saler_name, @@ -839,30 +839,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_year, use_month, - + custom_id, custom_name , - + std_goods_name, - + zone_id, zone_name, - + sale_type_id, sale_type_name, - + dosage_id, dosage_name, - + effect_id, effect_name, - + saler_id, saler_name, @@ -874,25 +874,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_year, use_month, - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + effect_id, - + saler_id, ifnull(SUM(this_month_sa_qty), 0) AS last_month_sa_qty, @@ -906,25 +906,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_year, use_month, - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + effect_id, - + saler_id, @@ -933,25 +933,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND last_month_data.use_year = current_month.use_year - (current_month.use_month = 1) - + AND current_month.custom_id = last_month_data.custom_id - + AND current_month.std_goods_name = last_month_data.std_goods_name - + AND current_month.zone_id = last_month_data.zone_id - + AND current_month.sale_type_id = last_month_data.sale_type_id - + AND current_month.dosage_id = last_month_data.dosage_id - + AND current_month.effect_id = last_month_data.effect_id - + AND current_month.saler_id = last_month_data.saler_id LEFT JOIN ( @@ -960,25 +960,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_year, use_month, - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + effect_id, - + saler_id, ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty, @@ -1042,25 +1042,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_year, use_month, - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + effect_id, - + saler_id, @@ -1071,25 +1071,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yoy_month.use_year = current_month.use_year - 1 and yoy_month.use_month = current_month.use_month - + AND yoy_month.custom_id = current_month.custom_id - + AND yoy_month.std_goods_name = current_month.std_goods_name - + AND yoy_month.zone_id = current_month.zone_id - + AND yoy_month.sale_type_id = current_month.sale_type_id - + AND yoy_month.dosage_id = current_month.dosage_id - + AND yoy_month.effect_id = current_month.effect_id - + AND yoy_month.saler_id = current_month.saler_id @@ -1103,60 +1103,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY use_year ) total_month_data ON total_month_data.use_year = current_month.use_year - - - AND (current_month.use_year * 100 + current_month.use_month) >= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart}) - - - AND (current_month.use_year * 100 + current_month.use_month) <= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd}) - - and current_month.zone_name in - - #{name} - - - and current_month.sale_type_name in - - #{name} - - - and current_month.custom_name in - - #{name} - - - and current_month.dosage_name in - - #{name} - - - and current_month.effect_name in - - #{name} - - - and current_month.goods_name in - - #{name} - - - and current_month.province_name in - - #{name} - - - and current_month.saler_name in - - #{name} - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - and current_month.std_goods_name in - - #{name} - - - + + + + + + @@ -1182,7 +1182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ROUND(SUM(this_month_sa_money), 2) AS year_sa_money FROM new_gr_bi_sa_agg_month_count a - LEFT JOIN gr_contacts c ON a.saler_name = c.`name` + LEFT JOIN gr_report.gr_contacts c ON a.saler_name = c.`name` AND a.zone_name = c.zone WHERE use_year = YEAR(CURDATE()) @@ -1223,7 +1223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ROUND(SUM(this_month_sa_money), 2) AS year_sa_money FROM new_gr_bi_sa_agg a - LEFT JOIN gr_googs_proxy p ON a.goods_id = p.goods_id + LEFT JOIN gr_report.gr_googs_proxy p ON a.goods_id = p.goods_id WHERE use_year = YEAR(CURDATE()) AND sale_type_name = '代理品种' diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml index 42e4c6d..e07fb5c 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml @@ -249,31 +249,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" current_year_data.ny as ny, - + current_year_data.custom_id, current_year_data.custom_name, - + current_year_data.zone_id, current_year_data.zone_name, - + current_year_data.sale_type_id, current_year_data.sale_type_name, - + current_year_data.saler_id, current_year_data.saler_name, - + current_year_data.dosage_id, current_year_data.dosage_name, - + current_year_data.effect_id, current_year_data.effect_name, - + current_year_data.std_goods_name, @@ -335,30 +335,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM (SELECT use_year , use_year AS ny, - + custom_id, custom_name , - + std_goods_name, - + zone_id, zone_name, - + sale_type_id, sale_type_name, - + dosage_id, dosage_name, - + effect_id, effect_name, - + saler_id, saler_name, @@ -423,30 +423,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY use_year, - + custom_id, custom_name , - + std_goods_name, - + zone_id, zone_name, - + sale_type_id, sale_type_name, - + dosage_id, dosage_name, - + effect_id, effect_name, - + saler_id, saler_name, @@ -454,25 +454,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) as current_year_data LEFT JOIN (SELECT use_year, - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + effect_id, - + saler_id, ifnull(SUM(this_year_sa_qty), 0) AS last_year_sa_qty, @@ -533,50 +533,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY use_year, - + custom_id, - + std_goods_name, - + zone_id, - + sale_type_id, - + dosage_id, - + effect_id, - + saler_id, ) AS last_year_data ON last_year_data.use_year = current_year_data.use_year - 1 - + AND current_year_data.custom_id = last_year_data.custom_id - + AND current_year_data.std_goods_name = last_year_data.std_goods_name - + AND current_year_data.zone_id = last_year_data.zone_id - + AND current_year_data.sale_type_id = last_year_data.sale_type_id - + AND current_year_data.dosage_id = last_year_data.dosage_id - + AND current_year_data.effect_id = last_year_data.effect_id - + AND current_year_data.saler_id = last_year_data.saler_id LEFT JOIN (SELECT use_year,