From 806b921bb2920d0ae4552b82d969837ec6cbf734 Mon Sep 17 00:00:00 2001
From: king <hfjinsong@163.com>
Date: Thu, 26 Mar 2026 15:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E8=A1=A8=20=E5=90=88=E8=AE=A1sql=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/framework/entity/NewGrBiSaAggYearCount.java      | 4 ++--
 .../mapper/framework/NewGrBiSaAggMonthCountMapper.xml     | 8 ++++----
 .../mapper/framework/NewGrBiSaAggYearCountMapper.xml      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java
index 5695c93..556ef38 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java
@@ -148,10 +148,10 @@ public class NewGrBiSaAggYearCount implements Serializable
     private String thisYearProfitChange;
 
     @TableField(value = "this_year_sa_money_s")
-    private BigDecimal thissamoney_s;
+    private BigDecimal thisYearSaMoney_s;
 
     @TableField(value = "this_year_profit_s")
-    private BigDecimal thisprofit_s;
+    private BigDecimal thisYearProfit_s;
 
 
     @TableField(value = "saqty_yoy")
diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
index ee0334b..0d41d32 100644
--- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
@@ -39,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lastMonthProfitShare"    column="last_month_profit_share"    />
         <result property="thisMonthSaMoneyShare"    column="this_month_sa_money_share"    />
         <result property="thisMonthProfitShare"    column="this_month_profit_share"    />
-        <result property="thisMonthSaMoney_s"    column="thissamoney_s"    />
-        <result property="thisMonthProfit_s"    column="thisprofit_s"    />
+        <result property="thisMonthSaMoney_s"    column="this_month_sa_money_s"    />
+        <result property="thisMonthProfit_s"    column="this_month_profit_s"    />
         <result property="monthsaqty_yoy"    column="monthsaqty_yoy"    />
         <result property="monthsamoney_yoy"    column="monthsamoney_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
-        ROUND(SUM(this_month_sa_money) / 10000, 2) AS thissamoney_s,
-        ROUND(SUM(this_month_profit) / 10000, 2) AS thisprofit_s
+        ROUND(SUM(this_month_sa_money) / 10000, 2) AS this_month_sa_money_s,
+        ROUND(SUM(this_month_profit) / 10000, 2) AS this_month_profit_s
         FROM  new_gr_bi_sa_agg_month_count
         <where>
             <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>
diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
index 86154c0..53befc7 100644
--- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisYearSaMoneyGrowth"    column="this_year_sa_money_growth"    />
         <result property="thisYearProfitGrowth"    column="this_year_profit_growth"    />
         <result property="thisYearProfitChange"    column="this_year_profit_change"    />
-        <result property="thissamoney_s"    column="this_year_sa_money_s"    />
-        <result property="thisprofit_s"    column="this_year_profit_s"    />
+        <result property="thisYearSaMoney_s"    column="this_year_sa_money_s"    />
+        <result property="thisYearProfit_s"    column="this_year_profit_s"    />
         <result property="saqty_yoy"    column="saqty_yoy"    />
         <result property="samoney_yoy"    column="samoney_yoy"    />
         <result property="profit_yoy"    column="profit_yoy"    />