admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_js_20260420'

Browse Source
This commit is contained in:
king
2026-04-27 11:53:04 +08:00
parent 8d8e68043a 3bf9ed4122
commit 0e6454dddd
2 changed files with 241 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

398
lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
View File

@@ -270,27 +270,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{saAggParam.useYearEnd} as useYearEnd, #{saAggParam.useYearEnd} as useYearEnd,
#{saAggParam.useMonthStart} as useMonthStart, #{saAggParam.useMonthStart} as useMonthStart,
#{saAggParam.useMonthEnd} as useMonthEnd, #{saAggParam.useMonthEnd} as useMonthEnd,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName') ">
current_month.custom_id, current_month.custom_id,
current_month.custom_name, current_month.custom_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName') ">
current_month.zone_id, current_month.zone_id,
current_month.zone_name, current_month.zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
current_month.sale_type_id, current_month.sale_type_id,
current_month.sale_type_name, current_month.sale_type_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
current_month.saler_id, current_month.saler_id,
current_month.saler_name, current_month.saler_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
current_month.dosage_id, current_month.dosage_id,
current_month.dosage_name, current_month.dosage_name,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
current_month.std_goods_name, current_month.std_goods_name,
</if> </if>
current_month.this_month_sa_qty AS this_month_sa_qty, current_month.this_month_sa_qty AS this_month_sa_qty,
@@ -351,32 +351,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
</trim> </trim>
FROM ( SELECT FROM ( SELECT
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
custom_name , custom_name ,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
zone_name, zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
sale_type_name, sale_type_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
dosage_name, dosage_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
saler_name, saler_name,
</if> </if>
ifnull(sum(this_month_sa_qty), 0) AS this_month_sa_qty, 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_sa_money), 0) AS this_month_sa_money,
ifnull(sum(this_month_cost), 0) AS this_month_cost, ifnull(sum(this_month_cost), 0) AS this_month_cost,
@@ -430,26 +430,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
GROUP BY GROUP BY
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
custom_name , custom_name ,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
zone_name, zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
sale_type_name, sale_type_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
dosage_name, dosage_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
saler_name, saler_name,
</if> </if>
@@ -458,22 +458,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.isOneYear" > <if test="params.isOneYear" >
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty, ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty,
@@ -528,43 +528,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
GROUP BY GROUP BY
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
</trim> </trim>
) yoy_month ON ) yoy_month ON
<trim prefixOverrides="and"> <trim prefixOverrides="and">
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
AND yoy_month.custom_id = current_month.custom_id AND yoy_month.custom_id = current_month.custom_id
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
AND yoy_month.std_goods_name = current_month.std_goods_name AND yoy_month.std_goods_name = current_month.std_goods_name
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
AND yoy_month.zone_id = current_month.zone_id AND yoy_month.zone_id = current_month.zone_id
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
AND yoy_month.sale_type_id = current_month.sale_type_id AND yoy_month.sale_type_id = current_month.sale_type_id
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
AND yoy_month.dosage_id = current_month.dosage_id AND yoy_month.dosage_id = current_month.dosage_id
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
AND yoy_month.saler_id = current_month.saler_id AND yoy_month.saler_id = current_month.saler_id
</if> </if>
</trim> </trim>
@@ -580,49 +580,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(use_year * 100 + use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart}) (use_year * 100 + use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart})
AND (use_year * 100 + use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd}) AND (use_year * 100 + use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd})
) total_month_data ) total_month_data
<where> <!-- <where>-->
<if test="saAggParam.zoneName != null and saAggParam.zoneName != ''"> and current_month.zone_name in <!-- <if test="saAggParam.zoneName != null and saAggParam.zoneName != ''"> and current_month.zone_name in-->
<foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.saleTypeName != null and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in <!-- <if test="saAggParam.saleTypeName != null and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in-->
<foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.customName != null and saAggParam.customName != ''"> and current_month.custom_name in <!-- <if test="saAggParam.customName != null and saAggParam.customName != ''"> and current_month.custom_name in-->
<foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.dosageName != null and saAggParam.dosageName != ''"> and current_month.dosage_name in <!-- <if test="saAggParam.dosageName != null and saAggParam.dosageName != ''"> and current_month.dosage_name in-->
<foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.goodsName != null and saAggParam.goodsName != ''"> and current_month.goods_name in <!-- <if test="saAggParam.goodsName != null and saAggParam.goodsName != ''"> and current_month.goods_name in-->
<foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.provinceName != null and saAggParam.provinceName != ''"> and current_month.province_name in <!-- <if test="saAggParam.provinceName != null and saAggParam.provinceName != ''"> and current_month.province_name in-->
<foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.salerName != null and saAggParam.salerName != ''"> and current_month.saler_name in <!-- <if test="saAggParam.salerName != null and saAggParam.salerName != ''"> and current_month.saler_name in-->
<foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.stdGoodsName != null and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in <!-- <if test="saAggParam.stdGoodsName != null and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in-->
<foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
</where> <!-- </where>-->
</select> </select>
@@ -638,31 +638,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LPAD(current_month.use_month, 2, '0') as ny, LPAD(current_month.use_month, 2, '0') as ny,
</otherwise> </otherwise>
</choose> </choose>
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
current_month.custom_id, current_month.custom_id,
current_month.custom_name, current_month.custom_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
current_month.zone_id, current_month.zone_id,
current_month.zone_name, current_month.zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
current_month.sale_type_id, current_month.sale_type_id,
current_month.sale_type_name, current_month.sale_type_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
current_month.saler_id, current_month.saler_id,
current_month.saler_name, current_month.saler_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
current_month.dosage_id, current_month.dosage_id,
current_month.dosage_name, current_month.dosage_name,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
current_month.effect_id, current_month.effect_id,
current_month.effect_name, current_month.effect_name,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
current_month.std_goods_name, current_month.std_goods_name,
</if> </if>
current_month.this_month_sa_qty AS this_month_sa_qty, 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_year,
</if> </if>
use_month, use_month,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
custom_name , custom_name ,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
zone_name, zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
sale_type_name, sale_type_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
dosage_name, dosage_name,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
effect_name, effect_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
saler_name, saler_name,
</if> </if>
@@ -839,30 +839,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
use_year, use_year,
</if> </if>
use_month, use_month,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
custom_name , custom_name ,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
zone_name, zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
sale_type_name, sale_type_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
dosage_name, dosage_name,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
effect_name, effect_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
saler_name, saler_name,
</if> </if>
@@ -874,25 +874,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
use_year, use_year,
</if> </if>
use_month, use_month,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
ifnull(SUM(this_month_sa_qty), 0) AS last_month_sa_qty, 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_year,
</if> </if>
use_month, use_month,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
</trim> </trim>
@@ -933,25 +933,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupFieldList.contains('useYear') || params.containsKey('useYearStart')|| params.containsKey('useYearEnd')"> <if test="groupFieldList.contains('useYear') || params.containsKey('useYearStart')|| params.containsKey('useYearEnd')">
AND last_month_data.use_year = current_month.use_year - (current_month.use_month = 1) AND last_month_data.use_year = current_month.use_year - (current_month.use_month = 1)
</if> </if>
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
AND current_month.custom_id = last_month_data.custom_id AND current_month.custom_id = last_month_data.custom_id
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
AND current_month.std_goods_name = last_month_data.std_goods_name AND current_month.std_goods_name = last_month_data.std_goods_name
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
AND current_month.zone_id = last_month_data.zone_id AND current_month.zone_id = last_month_data.zone_id
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
AND current_month.sale_type_id = last_month_data.sale_type_id AND current_month.sale_type_id = last_month_data.sale_type_id
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
AND current_month.dosage_id = last_month_data.dosage_id AND current_month.dosage_id = last_month_data.dosage_id
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
AND current_month.effect_id = last_month_data.effect_id AND current_month.effect_id = last_month_data.effect_id
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
AND current_month.saler_id = last_month_data.saler_id AND current_month.saler_id = last_month_data.saler_id
</if> </if>
LEFT JOIN ( LEFT JOIN (
@@ -960,25 +960,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
use_year, use_year,
</if> </if>
use_month, use_month,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty, 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_year,
</if> </if>
use_month, use_month,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
</trim> </trim>
@@ -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_year = current_month.use_year - 1
</if> </if>
and yoy_month.use_month = current_month.use_month and yoy_month.use_month = current_month.use_month
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
AND yoy_month.custom_id = current_month.custom_id AND yoy_month.custom_id = current_month.custom_id
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
AND yoy_month.std_goods_name = current_month.std_goods_name AND yoy_month.std_goods_name = current_month.std_goods_name
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
AND yoy_month.zone_id = current_month.zone_id AND yoy_month.zone_id = current_month.zone_id
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
AND yoy_month.sale_type_id = current_month.sale_type_id AND yoy_month.sale_type_id = current_month.sale_type_id
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
AND yoy_month.dosage_id = current_month.dosage_id AND yoy_month.dosage_id = current_month.dosage_id
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
AND yoy_month.effect_id = current_month.effect_id AND yoy_month.effect_id = current_month.effect_id
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
AND yoy_month.saler_id = current_month.saler_id AND yoy_month.saler_id = current_month.saler_id
</if> </if>
</trim> </trim>
@@ -1103,60 +1103,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY GROUP BY
use_year use_year
) total_month_data ON total_month_data.use_year = current_month.use_year ) total_month_data ON total_month_data.use_year = current_month.use_year
<where> <!-- <where>-->
<if test="saAggParam.useYearStart != null and saAggParam.useYearStart != '' and saAggParam.useMonthStart != null and saAggParam.useMonthStart != ''"> <!-- <if test="saAggParam.useYearStart != null and saAggParam.useYearStart != '' and saAggParam.useMonthStart != null and saAggParam.useMonthStart != ''">-->
AND (current_month.use_year * 100 + current_month.use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart}) <!-- AND (current_month.use_year * 100 + current_month.use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart})-->
</if> <!-- </if>-->
<if test="saAggParam.useYearEnd != null and saAggParam.useYearEnd != '' and saAggParam.useMonthEnd != null and saAggParam.useMonthEnd != ''"> <!-- <if test="saAggParam.useYearEnd != null and saAggParam.useYearEnd != '' and saAggParam.useMonthEnd != null and saAggParam.useMonthEnd != ''">-->
AND (current_month.use_year * 100 + current_month.use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd}) <!-- AND (current_month.use_year * 100 + current_month.use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd})-->
</if> <!-- </if>-->
<if test="saAggParam.zoneName != null and saAggParam.zoneName != ''"> and current_month.zone_name in <!-- <if test="groupFieldList.contains('zoneName') and saAggParam.zoneName != null and saAggParam.zoneName != ''"> and current_month.zone_name in-->
<foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.saleTypeName != null and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in <!-- <if test="groupFieldList.contains('saleTypeName') and saAggParam.saleTypeName != null and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in-->
<foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.customName != null and saAggParam.customName != ''"> and current_month.custom_name in <!-- <if test="groupFieldList.contains('customName') and saAggParam.customName != null and saAggParam.customName != ''"> and current_month.custom_name in-->
<foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.dosageName != null and saAggParam.dosageName != ''"> and current_month.dosage_name in <!-- <if test="groupFieldList.contains('dosageName') and saAggParam.dosageName != null and saAggParam.dosageName != ''"> and current_month.dosage_name in-->
<foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.effectName != null and saAggParam.effectName != ''"> and current_month.effect_name in <!-- <if test="groupFieldList.contains('effectName') and saAggParam.effectName != null and saAggParam.effectName != ''"> and current_month.effect_name in-->
<foreach collection="saAggParam.effectName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.effectName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.goodsName != null and saAggParam.goodsName != ''"> and current_month.goods_name in <!-- <if test="groupFieldList.contains('goodsName') and saAggParam.goodsName != null and saAggParam.goodsName != ''"> and current_month.goods_name in-->
<foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.provinceName != null and saAggParam.provinceName != ''"> and current_month.province_name in <!-- <if test="groupFieldList.contains('provinceName') and saAggParam.provinceName != null and saAggParam.provinceName != ''"> and current_month.province_name in-->
<foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.salerName != null and saAggParam.salerName != ''"> and current_month.saler_name in <!-- <if test="groupFieldList.contains('salerName') and saAggParam.salerName != null and saAggParam.salerName != ''"> and current_month.saler_name in-->
<foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="saAggParam.stdGoodsName != null and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in <!-- <if test="groupFieldList.contains('stdGoodsName') and saAggParam.stdGoodsName != null and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in-->
<foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")"> <!-- <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">-->
#{name} <!-- #{name}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
</where> <!-- </where>-->
</select> </select>
@@ -1182,7 +1182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ROUND(SUM(this_month_sa_money), 2) AS year_sa_money ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
FROM FROM
new_gr_bi_sa_agg_month_count a 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 AND a.zone_name = c.zone
WHERE WHERE
use_year = YEAR(CURDATE()) 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 ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
FROM FROM
new_gr_bi_sa_agg a 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 WHERE
use_year = YEAR(CURDATE()) use_year = YEAR(CURDATE())
AND sale_type_name = '代理品种' AND sale_type_name = '代理品种'

84
lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
View File

@@ -249,31 +249,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupFieldList.contains('useYear') || params.containsKey('useYearStart') || params.containsKey('useYearEnd')"> <if test="groupFieldList.contains('useYear') || params.containsKey('useYearStart') || params.containsKey('useYearEnd')">
current_year_data.ny as ny, current_year_data.ny as ny,
</if> </if>
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
current_year_data.custom_id, current_year_data.custom_id,
current_year_data.custom_name, current_year_data.custom_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
current_year_data.zone_id, current_year_data.zone_id,
current_year_data.zone_name, current_year_data.zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
current_year_data.sale_type_id, current_year_data.sale_type_id,
current_year_data.sale_type_name, current_year_data.sale_type_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
current_year_data.saler_id, current_year_data.saler_id,
current_year_data.saler_name, current_year_data.saler_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
current_year_data.dosage_id, current_year_data.dosage_id,
current_year_data.dosage_name, current_year_data.dosage_name,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
current_year_data.effect_id, current_year_data.effect_id,
current_year_data.effect_name, current_year_data.effect_name,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
current_year_data.std_goods_name, current_year_data.std_goods_name,
</if> </if>
@@ -335,30 +335,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
(SELECT use_year , (SELECT use_year ,
use_year AS ny, use_year AS ny,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
custom_name , custom_name ,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
zone_name, zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
sale_type_name, sale_type_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
dosage_name, dosage_name,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
effect_name, effect_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
saler_name, saler_name,
</if> </if>
@@ -423,30 +423,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY GROUP BY
<trim suffixOverrides=","> <trim suffixOverrides=",">
use_year, use_year,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
custom_name , custom_name ,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
zone_name, zone_name,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
sale_type_name, sale_type_name,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
dosage_name, dosage_name,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
effect_name, effect_name,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
saler_name, saler_name,
</if> </if>
@@ -454,25 +454,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) as current_year_data ) as current_year_data
LEFT JOIN (SELECT use_year, LEFT JOIN (SELECT use_year,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
ifnull(SUM(this_year_sa_qty), 0) AS last_year_sa_qty, 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 GROUP BY
<trim suffixOverrides=","> <trim suffixOverrides=",">
use_year, use_year,
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
custom_id, custom_id,
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
std_goods_name, std_goods_name,
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
zone_id, zone_id,
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
sale_type_id, sale_type_id,
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
dosage_id, dosage_id,
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
effect_id, effect_id,
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
saler_id, saler_id,
</if> </if>
</trim> </trim>
) AS last_year_data ) AS last_year_data
ON last_year_data.use_year = current_year_data.use_year - 1 ON last_year_data.use_year = current_year_data.use_year - 1
<if test="groupFieldList.contains('customName') || params.containsKey('customName')"> <if test="groupFieldList.contains('customName')">
AND current_year_data.custom_id = last_year_data.custom_id AND current_year_data.custom_id = last_year_data.custom_id
</if> </if>
<if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')"> <if test="groupFieldList.contains('stdGoodsName')">
AND current_year_data.std_goods_name = last_year_data.std_goods_name AND current_year_data.std_goods_name = last_year_data.std_goods_name
</if> </if>
<if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')"> <if test="groupFieldList.contains('zoneName')">
AND current_year_data.zone_id = last_year_data.zone_id AND current_year_data.zone_id = last_year_data.zone_id
</if> </if>
<if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')"> <if test="groupFieldList.contains('saleTypeName')">
AND current_year_data.sale_type_id = last_year_data.sale_type_id AND current_year_data.sale_type_id = last_year_data.sale_type_id
</if> </if>
<if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')"> <if test="groupFieldList.contains('dosageName')">
AND current_year_data.dosage_id = last_year_data.dosage_id AND current_year_data.dosage_id = last_year_data.dosage_id
</if> </if>
<if test="groupFieldList.contains('effectName') || params.containsKey('effectName')"> <if test="groupFieldList.contains('effectName')">
AND current_year_data.effect_id = last_year_data.effect_id AND current_year_data.effect_id = last_year_data.effect_id
</if> </if>
<if test="groupFieldList.contains('salerName') || params.containsKey('salerName')"> <if test="groupFieldList.contains('salerName')">
AND current_year_data.saler_id = last_year_data.saler_id AND current_year_data.saler_id = last_year_data.saler_id
</if> </if>
LEFT JOIN (SELECT use_year, LEFT JOIN (SELECT use_year,