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

Merge branch 'refs/heads/dev_js_20260325'

Browse Source
This commit is contained in:
king
2026-03-26 15:52:34 +08:00
parent cb282506b1 806b921bb2
commit eac8a6f042
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java
View File

@@ -148,10 +148,10 @@ public class NewGrBiSaAggYearCount implements Serializable
private String thisYearProfitChange; private String thisYearProfitChange;
@TableField(value = "this_year_sa_money_s") @TableField(value = "this_year_sa_money_s")
private BigDecimal thissamoney_s; private BigDecimal thisYearSaMoney_s;
@TableField(value = "this_year_profit_s") @TableField(value = "this_year_profit_s")
private BigDecimal thisprofit_s; private BigDecimal thisYearProfit_s;
@TableField(value = "saqty_yoy") @TableField(value = "saqty_yoy")

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

@@ -39,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lastMonthProfitShare" column="last_month_profit_share" /> <result property="lastMonthProfitShare" column="last_month_profit_share" />
<result property="thisMonthSaMoneyShare" column="this_month_sa_money_share" /> <result property="thisMonthSaMoneyShare" column="this_month_sa_money_share" />
<result property="thisMonthProfitShare" column="this_month_profit_share" /> <result property="thisMonthProfitShare" column="this_month_profit_share" />
<result property="thisMonthSaMoney_s" column="thissamoney_s" /> <result property="thisMonthSaMoney_s" column="this_month_sa_money_s" />
<result property="thisMonthProfit_s" column="thisprofit_s" /> <result property="thisMonthProfit_s" column="this_month_profit_s" />
<result property="monthsaqty_yoy" column="monthsaqty_yoy" /> <result property="monthsaqty_yoy" column="monthsaqty_yoy" />
<result property="monthsamoney_yoy" column="monthsamoney_yoy" /> <result property="monthsamoney_yoy" column="monthsamoney_yoy" />
<result property="lastMonthSaMoney_yoy" column="lastMonthSaMoney_yoy" /> <result property="lastMonthSaMoney_yoy" column="lastMonthSaMoney_yoy" />
@@ -54,8 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getTotalDetail" parameterType="com.lideeyunji.core.framework.params.SaAggParam" resultMap="NewGrBiSaAggMonthCountResult"> <select id="getTotalDetail" parameterType="com.lideeyunji.core.framework.params.SaAggParam" resultMap="NewGrBiSaAggMonthCountResult">
SELECT SELECT
ROUND(SUM(this_month_sa_money) / 10000, 2) AS thissamoney_s, ROUND(SUM(this_month_sa_money) / 10000, 2) AS this_month_sa_money_s,
ROUND(SUM(this_month_profit) / 10000, 2) AS thisprofit_s ROUND(SUM(this_month_profit) / 10000, 2) AS this_month_profit_s
FROM new_gr_bi_sa_agg_month_count FROM new_gr_bi_sa_agg_month_count
<where> <where>
<if test="saAggParam.useYear != null and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if> <if test="saAggParam.useYear != null and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>

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

@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="thisYearSaMoneyGrowth" column="this_year_sa_money_growth" /> <result property="thisYearSaMoneyGrowth" column="this_year_sa_money_growth" />
<result property="thisYearProfitGrowth" column="this_year_profit_growth" /> <result property="thisYearProfitGrowth" column="this_year_profit_growth" />
<result property="thisYearProfitChange" column="this_year_profit_change" /> <result property="thisYearProfitChange" column="this_year_profit_change" />
<result property="thissamoney_s" column="this_year_sa_money_s" /> <result property="thisYearSaMoney_s" column="this_year_sa_money_s" />
<result property="thisprofit_s" column="this_year_profit_s" /> <result property="thisYearProfit_s" column="this_year_profit_s" />
<result property="saqty_yoy" column="saqty_yoy" /> <result property="saqty_yoy" column="saqty_yoy" />
<result property="samoney_yoy" column="samoney_yoy" /> <result property="samoney_yoy" column="samoney_yoy" />
<result property="profit_yoy" column="profit_yoy" /> <result property="profit_yoy" column="profit_yoy" />