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-23 08:23:15 +08:00
parent e685531b71 f768eba140
commit 8dc15baa30
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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_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_profit / 10000, 2) AS lastMonthProfit, \n"); //上月毛利额(元)
executePluginSql.append(" ROUND(last_month_data.last_month_cost / 10000, 2) AS lastMonthCost, \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_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_profit / 10000, 2) AS yoyMonthProfit, \n"); //同比月毛利额(元)
executePluginSql.append(" ROUND(yoy_month.yoy_month_cost / 10000, 2) AS yoyMonthCost, \n"); //同比月成本(元) executePluginSql.append(" ROUND(yoy_month.yoy_month_cost / 10000, 2) AS yoyMonthCost, \n"); //同比月成本(元)

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

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