Merge branch 'dev_js_20260420'

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkLineReportEnhance.java

@@ -343,7 +343,7 @@ public class ZhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         executePluginSql.append("     ROUND(last_month_data.last_month_sa_money / 10000, 2) AS lastMonthSaMoney,    \n"); //上月销售金额(元)
         executePluginSql.append("     ROUND(last_month_data.last_month_profit / 10000, 2) AS lastMonthProfit,    \n"); //上月毛利额(元)
         executePluginSql.append("     ROUND(last_month_data.last_month_cost / 10000, 2) AS lastMonthCost,    \n");  //上月成本(元)
-        executePluginSql.append("     ROUND(yoy_month.yoy_month_sa_qty / 10000, 2) AS yoyMonthSaQty,    \n");  //同比月销售数量(件)
+        executePluginSql.append("     yoy_month.yoy_month_sa_qty AS yoyMonthSaQty,    \n");  //同比月销售数量(件)
         executePluginSql.append("     ROUND(yoy_month.yoy_month_sa_money / 10000, 2) AS yoyMonthSaMoney,    \n");  //同比月销售金额(元)
         executePluginSql.append("     ROUND(yoy_month.yoy_month_profit / 10000, 2) AS yoyMonthProfit,    \n"); //同比月毛利额(元)
         executePluginSql.append("     ROUND(yoy_month.yoy_month_cost / 10000, 2) AS yoyMonthCost,    \n"); //同比月成本(元)

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiSaSetdtl.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @TableName("GR_BI_SA_SETDTL")
@@ -70,11 +71,11 @@ public class GrBiSaSetdtl implements Serializable {
     @TableField(value = "SAQTY")
     private Integer SAQTY;
     @TableField(value = "SAMONEY")
-    private Integer SAMONEY;
+    private BigDecimal SAMONEY;
     @TableField(value = "SAMONEYTX")
-    private Integer SAMONEYTX;
+    private BigDecimal SAMONEYTX;
     @TableField(value = "COST")
-    private Integer COST;
+    private BigDecimal COST;
     @TableField(value = "PROFIT")
-    private Integer PROFIT;
+    private BigDecimal PROFIT;
 }

lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml

@@ -664,7 +664,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ROUND(tbl_lgbsa.last_month_sa_money  / 10000, 2) as last_month_sa_money,
             ROUND(tbl_lgbsa.last_month_profit / 10000, 2) as last_month_profit,
             ROUND(tbl_lgbsa.last_month_cost / 10000, 2) as last_month_cost,
-            ROUND(tbl_lgbsa.yoy_month_sa_qty/ 10000, 2) as yoy_month_sa_qty,
+            tbl_lgbsa.yoy_month_sa_qty as yoy_month_sa_qty,
             ROUND(tbl_lgbsa.yoy_month_sa_money / 10000, 2) as yoy_month_sa_money,
             ROUND(tbl_lgbsa.yoy_month_profit / 10000, 2)  as yoy_month_profit,
             ROUND(tbl_lgbsa.yoy_month_cost / 10000, 2)    as yoy_month_cost,

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

@@ -301,7 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COALESCE (ROUND( current_month.this_month_profit/total_month_data.this_month_profit_sum * 100, 2), 0 ) as this_month_profit_share,
 
             <if test="params.isOneYear" >
-                ROUND(yoy_month.yoy_month_sa_qty / 10000, 2) AS yoy_month_sa_qty,
+                yoy_month.yoy_month_sa_qty AS yoy_month_sa_qty,
                 ROUND(yoy_month.yoy_month_sa_money / 10000, 2) AS yoy_month_sa_money,
                 ROUND(yoy_month.yoy_month_profit / 10000, 2) AS yoy_month_profit,
                 ROUND(yoy_month.yoy_month_cost / 10000, 2) AS yoy_month_cost,
@@ -673,7 +673,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ROUND(last_month_data.last_month_sa_money / 10000, 2) AS last_month_sa_money,
         ROUND(last_month_data.last_month_profit / 10000, 2) AS last_month_profit,
         ROUND(last_month_data.last_month_cost / 10000, 2) AS last_month_cost,
-        ROUND(yoy_month.yoy_month_sa_qty / 10000, 2) AS yoy_month_sa_qty,
+        yoy_month.yoy_month_sa_qty AS yoy_month_sa_qty,
         ROUND(yoy_month.yoy_month_sa_money / 10000, 2) AS yoy_month_sa_money,
         ROUND(yoy_month.yoy_month_profit / 10000, 2) AS yoy_month_profit,
         ROUND(yoy_month.yoy_month_cost / 10000, 2) AS yoy_month_cost,