diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAgg.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAgg.java index 5fd18ea..919773b 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAgg.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAgg.java @@ -1,9 +1,9 @@ package com.lideeyunji.core.framework.entity; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; /** @@ -31,7 +31,7 @@ public class NewGrBiSaAgg implements Serializable @TableField(value = "zone_id") - private Long zoneId; + private String zoneId; @TableField(value = "zone_name") @@ -39,7 +39,7 @@ public class NewGrBiSaAgg implements Serializable @TableField(value = "sale_type_id") - private Long saleTypeId; + private String saleTypeId; @TableField(value = "sale_type_name") @@ -47,7 +47,7 @@ public class NewGrBiSaAgg implements Serializable @TableField(value = "custom_id") - private Long customId; + private String customId; @TableField(value = "custom_name") @@ -55,7 +55,7 @@ public class NewGrBiSaAgg implements Serializable @TableField(value = "dosage_id") - private Long dosageId; + private String dosageId; @TableField(value = "dosage_name") @@ -82,7 +82,7 @@ public class NewGrBiSaAgg implements Serializable @TableField(value = "saler_id") - private Long salerId; + private String salerId; @TableField(value = "saler_name") @@ -90,19 +90,19 @@ public class NewGrBiSaAgg implements Serializable @TableField(value = "this_month_sa_qty") - private BigDecimal thisMonthSaQty; + private String thisMonthSaQty; @TableField(value = "this_month_sa_money") - private BigDecimal thisMonthSaMoney; + private String thisMonthSaMoney; @TableField(value = "this_month_cost") - private BigDecimal thisMonthCost; + private String thisMonthCost; @TableField(value = "this_month_profit") - private BigDecimal thisMonthProfit; + private String thisMonthProfit; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java index 1b92847..be315f7 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java @@ -1,10 +1,9 @@ package com.lideeyunji.core.framework.entity; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.Data; + import java.io.Serializable; /** @@ -32,11 +31,11 @@ public class NewGrBiSaAggMonthCount implements Serializable @TableField(value = "use_month") - private Long useMonth; + private String useMonth; @TableField(value = "zone_id") - private Long zoneId; + private String zoneId; @TableField(value = "zone_name") @@ -44,7 +43,7 @@ public class NewGrBiSaAggMonthCount implements Serializable @TableField(value = "sale_type_id") - private Long saleTypeId; + private String saleTypeId; @TableField(value = "sale_type_name") @@ -60,7 +59,7 @@ public class NewGrBiSaAggMonthCount implements Serializable @TableField(value = "dosage_id") - private Long dosageId; + private String dosageId; @TableField(value = "dosage_name") @@ -87,78 +86,78 @@ public class NewGrBiSaAggMonthCount implements Serializable @TableField(value = "this_month_sa_qty") - private Long thisMonthSaQty; + private String thisMonthSaQty; @TableField(value = "last_month_sa_qty") - private Long lastMonthSaQty; + private String lastMonthSaQty; @TableField(value = "yoy_month_sa_qty") - private Long yoyMonthSaQty; + private String yoyMonthSaQty; @TableField(value = "this_month_sa_money") - private BigDecimal thisMonthSaMoney; + private String thisMonthSaMoney; @TableField(value = "last_month_sa_money") - private BigDecimal lastMonthSaMoney; + private String lastMonthSaMoney; @TableField(value = "yoy_month_sa_money") - private BigDecimal yoyMonthSaMoney; + private String yoyMonthSaMoney; @TableField(value = "this_month_profit") - private BigDecimal thisMonthProfit; + private String thisMonthProfit; @TableField(value = "last_month_profit") - private BigDecimal lastMonthProfit; + private String lastMonthProfit; @TableField(value = "yoy_month_profit") - private BigDecimal yoyMonthProfit; + private String yoyMonthProfit; @TableField(value = "this_month_cost") - private BigDecimal thisMonthCost; + private String thisMonthCost; @TableField(value = "last_month_cost") - private BigDecimal lastMonthCost; + private String lastMonthCost; @TableField(value = "yoy_month_cost") - private BigDecimal yoyMonthCost; + private String yoyMonthCost; @TableField(value = "this_month_profit_rate") - private BigDecimal thisMonthProfitRate; + private String thisMonthProfitRate; @TableField(value = "last_month_profit_rate") - private BigDecimal lastMonthProfitRate; + private String lastMonthProfitRate; @TableField(value = "last_month_profit_share") - private BigDecimal lastMonthProfitShare; + private String lastMonthProfitShare; @TableField(value = "this_month_sa_money_share") - private BigDecimal thisMonthSaMoneyShare; + private String thisMonthSaMoneyShare; @TableField(value = "this_month_profit_share") - private BigDecimal thisMonthProfitShare; + private String thisMonthProfitShare; @TableField(value = "thissamoney_s") - private BigDecimal thisMonthSaMoney_s; + private String thisMonthSaMoney_s; @TableField(value = "thisprofit_s") - private BigDecimal thisMonthProfit_s; + private String thisMonthProfit_s; @TableField(value = "monthsaqty_yoy") private String monthsaqty_yoy; 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 556ef38..a0b7a1e 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 @@ -1,9 +1,9 @@ package com.lideeyunji.core.framework.entity; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; /** @@ -29,7 +29,7 @@ public class NewGrBiSaAggYearCount implements Serializable private String ny; @TableField(value = "zone_id") - private Long zoneId; + private String zoneId; @TableField(value = "zone_name") @@ -37,7 +37,7 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "sale_type_id") - private Long saleTypeId; + private String saleTypeId; @TableField(value = "sale_type_name") @@ -45,7 +45,7 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "custom_id") - private Long customId; + private String customId; @TableField(value = "custom_name") @@ -65,7 +65,7 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "province_id") - private Long provinceId; + private String provinceId; @TableField(value = "province_name") @@ -73,7 +73,7 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "saler_id") - private Long salerId; + private String salerId; @TableField(value = "saler_name") @@ -81,59 +81,59 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "this_year_sa_qty") - private Long thisYearSaQty; + private String thisYearSaQty; @TableField(value = "last_year_sa_qty") - private Long lastYearSaQty; + private String lastYearSaQty; @TableField(value = "this_year_sa_money") - private BigDecimal thisYearSaMoney; + private String thisYearSaMoney; @TableField(value = "last_year_sa_money") - private BigDecimal lastYearSaMoney; + private String lastYearSaMoney; @TableField(value = "this_year_profit") - private BigDecimal thisYearProfit; + private String thisYearProfit; @TableField(value = "last_year_profit") - private BigDecimal lastYearProfit; + private String lastYearProfit; @TableField(value = "this_year_cost") - private BigDecimal thisYearCost; + private String thisYearCost; @TableField(value = "last_year_cost") - private BigDecimal lastYearCost; + private String lastYearCost; @TableField(value = "this_year_profit_rate") - private BigDecimal thisYearProfitRate; + private String thisYearProfitRate; @TableField(value = "last_year_profit_rate") - private BigDecimal lastYearProfitRate; + private String lastYearProfitRate; @TableField(value = "this_year_profit_share") - private BigDecimal thisYearProfitShare; + private String thisYearProfitShare; @TableField(value = "last_year_profit_share") - private BigDecimal lastYearProfitShare; + private String lastYearProfitShare; @TableField(value = "this_year_sa_money_share") - private BigDecimal thisYearSaMoneyShare; + private String thisYearSaMoneyShare; @TableField(value = "last_year_sa_money_share") - private BigDecimal lastYearSaMoneyShare; + private String lastYearSaMoneyShare; @TableField(value = "this_year_sa_money_growth") @@ -148,10 +148,10 @@ public class NewGrBiSaAggYearCount implements Serializable private String thisYearProfitChange; @TableField(value = "this_year_sa_money_s") - private BigDecimal thisYearSaMoney_s; + private String thisYearSaMoney_s; @TableField(value = "this_year_profit_s") - private BigDecimal thisYearProfit_s; + private String thisYearProfit_s; @TableField(value = "saqty_yoy")