diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkLineReportEnhance.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkLineReportEnhance.java index e532d41..c2c8cf8 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkLineReportEnhance.java +++ b/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"); //同比月成本(元) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiSaSetdtl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiSaSetdtl.java index 19b83a5..98625f0 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/GrBiSaSetdtl.java +++ b/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; }