ljx：修改同比、匹配和招商的计算精准度，把long类型改成double类型

enteprise-admin/src/main/java/com/enteprise/attract_inv/service/impl/AttractInvServiceImpl.java

@@ -28,16 +28,16 @@ public class AttractInvServiceImpl implements IAttractInvService {
         String typeNum = attractInv.getTypeNum();
         int year = attractInv.getYear();
         //获取行业总产值和行业总用地
-        List<Long> aList = new ArrayList<>();
-        List<Long> bList = new ArrayList<>();
+        List<Double> aList = new ArrayList<>();
+        List<Double> bList = new ArrayList<>();
         double averageAnnualOutputValue = 0;
         double averageAnnualTaxPaid = 0;
         for (int i = 1; i<4; i++) {
             EnterpriseBaseDataYear dataYear = new EnterpriseBaseDataYear();
             //近三年行业数据
-            Long areaSum = 0L;
-            Long taxSum = 0L;
-            Long industrialSum = 0L;
+            double areaSum = 0;
+            double taxSum = 0;
+            double industrialSum = 0;
             dataYear.setYear(String.valueOf(year - i));
             dataYear.setCode(code);
             List<EnterpriseBaseDataYear> yearList = enterpriseBaseDataYearMapper.selectEnterpriseBaseDataYearList(dataYear);
@@ -52,14 +52,14 @@ public class AttractInvServiceImpl implements IAttractInvService {
             }
         }
         if (!aList.isEmpty()){
-            for (Long a : aList){
+            for (Double a : aList){
                 averageAnnualOutputValue += a;
             }
             //基准值
             attractInvReturnDto.setStandardA(averageAnnualOutputValue / aList.size() * 1.5);
         }
         if (!bList.isEmpty()){
-            for (Long b : bList){
+            for (Double b : bList){
                 averageAnnualTaxPaid += b;
             }
             attractInvReturnDto.setStandardB(averageAnnualTaxPaid / bList.size() * 1.5);
@@ -90,13 +90,12 @@ public class AttractInvServiceImpl implements IAttractInvService {
                 dataYear.setYear(String.valueOf(year - i));
                 dataYear.setEnterpriseName(enterpriseName);
                 List<EnterpriseBaseDataYear> yearList = enterpriseBaseDataYearMapper.selectEnterpriseBaseDataYearList(dataYear);
-                if(!yearList.isEmpty()) {
+                if (!yearList.isEmpty()) {
                     areaSum += yearList.get(0).getLandArea();
-                    Long tax = yearList.get(0).getPaidTax();
+                    double tax = yearList.get(0).getPaidTax();
                     taxSum += tax;
-                    Long industrialValue = yearList.get(0).getTotalIndustrialValue();
+                    double industrialValue = yearList.get(0).getTotalIndustrialValue();
                     industrialSum += industrialValue;
-
                     if (tax != 0) {
                         divisorA += 1;
                     }

enteprise-admin/src/main/java/com/enteprise/base_data_month/domain/EnterpriseBaseDataMonth.java

@@ -36,50 +36,50 @@ public class EnterpriseBaseDataMonth extends BaseEntity
 
     /** 用地面积 */
     @Excel(name = "用地面积")
-    private Long landArea;
+    private Double landArea;
 
     /** 工业总产值 */
     @Excel(name = "工业总产值")
-    private Long totalIndustrialValue;
+    private Double totalIndustrialValue;
 
     /** 工业增加值 */
     @Excel(name = "工业增加值")
-    private Long gdp;
+    private Double gdp;
 
     /** 应税收入 */
     @Excel(name = "应税收入")
-    private Long taxableIncome;
+    private Double taxableIncome;
 
     /** 实缴税金 */
     @Excel(name = "实缴税金")
-    private Long paidTax;
+    private Double paidTax;
 
     /** 主营业务收入 */
     @Excel(name = "主营业务收入")
-    private Long mainBusinessIncome;
+    private Double mainBusinessIncome;
 
     /** 从业人员数 */
     @Excel(name = "从业人员数")
-    private Long employeeNumber;
+    private Double employeeNumber;
 
     /** 利润总额 */
     @Excel(name = "利润总额")
-    private Long profit;
+    private Double profit;
 
     /** 所有者权益 */
     @Excel(name = "所有者权益")
-    private Long ownerEquity;
+    private Double ownerEquity;
 
     /** 研发经费 */
     @Excel(name = "研发经费")
-    private Long funding;
+    private Double funding;
 
     /** 能源消费量 */
     @Excel(name = "能源消费量")
-    private Long energyConsume;
+    private Double energyConsume;
 
     @Excel(name = "电力消费量")
-    private Long powerConsume;
+    private Double powerConsume;
     /** 年份 */
     @Excel(name = "年份")
     private String year;
@@ -88,200 +88,180 @@ public class EnterpriseBaseDataMonth extends BaseEntity
     @Excel(name = "月份")
     private String month;
 
+    public Long getId() {
+        return id;
+    }
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
-        return id;
+    public String getEnterpriseName() {
+        return enterpriseName;
     }
-    public void setEnterpriseName(String enterpriseName)
-    {
+
+    public void setEnterpriseName(String enterpriseName) {
         this.enterpriseName = enterpriseName;
     }
 
-    public String getEnterpriseName()
-    {
-        return enterpriseName;
+    public String getLocation() {
+        return location;
     }
-    public void setLocation(String location)
-    {
+
+    public void setLocation(String location) {
         this.location = location;
     }
 
-    public String getLocation()
-    {
-        return location;
+    public String getCode() {
+        return code;
     }
-    public void setCode(String code)
-    {
+
+    public void setCode(String code) {
         this.code = code;
     }
 
-    public String getCode()
-    {
-        return code;
+    public String getMainBusiness() {
+        return mainBusiness;
     }
-    public void setMainBusiness(String mainBusiness)
-    {
+
+    public void setMainBusiness(String mainBusiness) {
         this.mainBusiness = mainBusiness;
     }
 
-    public String getMainBusiness()
-    {
-        return mainBusiness;
+    public Double getLandArea() {
+        return landArea;
     }
-    public void setLandArea(Long landArea)
-    {
+
+    public void setLandArea(Double landArea) {
         this.landArea = landArea;
     }
 
-    public Long getLandArea()
-    {
-        return landArea;
+    public Double getTotalIndustrialValue() {
+        return totalIndustrialValue;
     }
-    public void setTotalIndustrialValue(Long totalIndustrialValue)
-    {
+
+    public void setTotalIndustrialValue(Double totalIndustrialValue) {
         this.totalIndustrialValue = totalIndustrialValue;
     }
 
-    public Long getTotalIndustrialValue()
-    {
-        return totalIndustrialValue;
+    public Double getGdp() {
+        return gdp;
     }
-    public void setGdp(Long gdp)
-    {
+
+    public void setGdp(Double gdp) {
         this.gdp = gdp;
     }
 
-    public Long getGdp()
-    {
-        return gdp;
+    public Double getTaxableIncome() {
+        return taxableIncome;
     }
-    public void setTaxableIncome(Long taxableIncome)
-    {
+
+    public void setTaxableIncome(Double taxableIncome) {
         this.taxableIncome = taxableIncome;
     }
 
-    public Long getTaxableIncome()
-    {
-        return taxableIncome;
+    public Double getPaidTax() {
+        return paidTax;
     }
-    public void setPaidTax(Long paidTax)
-    {
+
+    public void setPaidTax(Double paidTax) {
         this.paidTax = paidTax;
     }
 
-    public Long getPaidTax()
-    {
-        return paidTax;
+    public Double getMainBusinessIncome() {
+        return mainBusinessIncome;
     }
-    public void setMainBusinessIncome(Long mainBusinessIncome)
-    {
+
+    public void setMainBusinessIncome(Double mainBusinessIncome) {
         this.mainBusinessIncome = mainBusinessIncome;
     }
 
-    public Long getMainBusinessIncome()
-    {
-        return mainBusinessIncome;
+    public Double getEmployeeNumber() {
+        return employeeNumber;
     }
-    public void setEmployeeNumber(Long employeeNumber)
-    {
+
+    public void setEmployeeNumber(Double employeeNumber) {
         this.employeeNumber = employeeNumber;
     }
 
-    public Long getEmployeeNumber()
-    {
-        return employeeNumber;
+    public Double getProfit() {
+        return profit;
     }
-    public void setProfit(Long profit)
-    {
+
+    public void setProfit(Double profit) {
         this.profit = profit;
     }
 
-    public Long getProfit()
-    {
-        return profit;
+    public Double getOwnerEquity() {
+        return ownerEquity;
     }
-    public void setOwnerEquity(Long ownerEquity)
-    {
+
+    public void setOwnerEquity(Double ownerEquity) {
         this.ownerEquity = ownerEquity;
     }
 
-    public Long getOwnerEquity()
-    {
-        return ownerEquity;
+    public Double getFunding() {
+        return funding;
     }
-    public void setFunding(Long funding)
-    {
+
+    public void setFunding(Double funding) {
         this.funding = funding;
     }
 
-    public Long getFunding()
-    {
-        return funding;
+    public Double getEnergyConsume() {
+        return energyConsume;
     }
-    public void setEnergyConsume(Long energyConsume)
-    {
+
+    public void setEnergyConsume(Double energyConsume) {
         this.energyConsume = energyConsume;
     }
 
-    public Long getEnergyConsume()
-    {
-        return energyConsume;
-    }
-    public Long getPowerConsume()
-    {
+    public Double getPowerConsume() {
         return powerConsume;
     }
-    public void setPowerConsume(Long powerConsume)
-    {
+
+    public void setPowerConsume(Double powerConsume) {
         this.powerConsume = powerConsume;
     }
-    public void setYear(String year)
-    {
-        this.year = year;
-    }
 
-    public String getYear()
-    {
+    public String getYear() {
         return year;
     }
-    public void setMonth(String month)
-    {
-        this.month = month;
+
+    public void setYear(String year) {
+        this.year = year;
     }
 
-    public String getMonth()
-    {
+    public String getMonth() {
         return month;
     }
 
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("enterpriseName", getEnterpriseName())
-            .append("location", getLocation())
-            .append("code", getCode())
-            .append("mainBusiness", getMainBusiness())
-            .append("landArea", getLandArea())
-            .append("totalIndustrialValue", getTotalIndustrialValue())
-            .append("gdp", getGdp())
-            .append("taxableIncome", getTaxableIncome())
-            .append("paidTax", getPaidTax())
-            .append("mainBusinessIncome", getMainBusinessIncome())
-            .append("employeeNumber", getEmployeeNumber())
-            .append("profit", getProfit())
-            .append("ownerEquity", getOwnerEquity())
-            .append("funding", getFunding())
-            .append("energyConsume", getEnergyConsume())
-                .append("powerConsume", getPowerConsume())
-            .append("year", getYear())
-            .append("month", getMonth())
-            .toString();
+        return "EnterpriseBaseDataMonth{" +
+                "id=" + id +
+                ", enterpriseName='" + enterpriseName + '\'' +
+                ", location='" + location + '\'' +
+                ", code='" + code + '\'' +
+                ", mainBusiness='" + mainBusiness + '\'' +
+                ", landArea=" + landArea +
+                ", totalIndustrialValue=" + totalIndustrialValue +
+                ", gdp=" + gdp +
+                ", taxableIncome=" + taxableIncome +
+                ", paidTax=" + paidTax +
+                ", mainBusinessIncome=" + mainBusinessIncome +
+                ", employeeNumber=" + employeeNumber +
+                ", profit=" + profit +
+                ", ownerEquity=" + ownerEquity +
+                ", funding=" + funding +
+                ", energyConsume=" + energyConsume +
+                ", powerConsume=" + powerConsume +
+                ", year='" + year + '\'' +
+                ", month='" + month + '\'' +
+                '}';
     }
 }

enteprise-admin/src/main/java/com/enteprise/base_data_year/domain/EnterpriseBaseDataYear.java

@@ -36,50 +36,50 @@ public class EnterpriseBaseDataYear extends BaseEntity
 
     /** 用地面积 */
     @Excel(name = "用地面积")
-    private Long landArea;
+    private Double landArea;
 
     /** 工业总产值 */
     @Excel(name = "工业总产值")
-    private Long totalIndustrialValue;
+    private Double totalIndustrialValue;
 
     /** 工业增加值 */
     @Excel(name = "工业增加值")
-    private Long gdp;
+    private Double gdp;
 
     /** 应税收入 */
     @Excel(name = "应税收入")
-    private Long taxableIncome;
+    private Double taxableIncome;
 
     /** 实缴税金 */
     @Excel(name = "实缴税金")
-    private Long paidTax;
+    private Double paidTax;
 
     /** 主营业务收入 */
     @Excel(name = "主营业务收入")
-    private Long mainBusinessIncome;
+    private Double mainBusinessIncome;
 
     /** 从业人员数 */
     @Excel(name = "从业人员数")
-    private Long employeeNumber;
+    private Double employeeNumber;
 
     /** 利润总额 */
     @Excel(name = "利润总额")
-    private Long profit;
+    private Double profit;
 
     /** 所有者权益 */
     @Excel(name = "所有者权益")
-    private Long ownerEquity;
+    private Double ownerEquity;
 
     /** 研发经费 */
     @Excel(name = "研发经费")
-    private Long funding;
+    private Double funding;
 
     /** 能源消费量 */
     @Excel(name = "能源消费量")
-    private Long energyConsume;
+    private Double energyConsume;
 
     @Excel(name = "电力消费量")
-    private Long powerConsume;
+    private Double powerConsume;
 
 
     /** 年份 */
@@ -90,201 +90,180 @@ public class EnterpriseBaseDataYear extends BaseEntity
     @Excel(name = "月份")
     private String month;
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setEnterpriseName(String enterpriseName)
-    {
-        this.enterpriseName = enterpriseName;
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getEnterpriseName()
-    {
+    public String getEnterpriseName() {
         return enterpriseName;
     }
-    public void setLocation(String location)
-    {
-        this.location = location;
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
     }
 
-    public String getLocation()
-    {
+    public String getLocation() {
         return location;
     }
-    public void setCode(String code)
-    {
-        this.code = code;
+
+    public void setLocation(String location) {
+        this.location = location;
     }
 
-    public String getCode()
-    {
+    public String getCode() {
         return code;
     }
-    public void setMainBusiness(String mainBusiness)
-    {
-        this.mainBusiness = mainBusiness;
+
+    public void setCode(String code) {
+        this.code = code;
     }
 
-    public String getMainBusiness()
-    {
+    public String getMainBusiness() {
         return mainBusiness;
     }
-    public void setLandArea(Long landArea)
-    {
-        this.landArea = landArea;
+
+    public void setMainBusiness(String mainBusiness) {
+        this.mainBusiness = mainBusiness;
     }
 
-    public Long getLandArea()
-    {
+    public Double getLandArea() {
         return landArea;
     }
-    public void setTotalIndustrialValue(Long totalIndustrialValue)
-    {
-        this.totalIndustrialValue = totalIndustrialValue;
+
+    public void setLandArea(Double landArea) {
+        this.landArea = landArea;
     }
 
-    public Long getTotalIndustrialValue()
-    {
+    public Double getTotalIndustrialValue() {
         return totalIndustrialValue;
     }
-    public void setGdp(Long gdp)
-    {
-        this.gdp = gdp;
+
+    public void setTotalIndustrialValue(Double totalIndustrialValue) {
+        this.totalIndustrialValue = totalIndustrialValue;
     }
 
-    public Long getGdp()
-    {
+    public Double getGdp() {
         return gdp;
     }
-    public void setTaxableIncome(Long taxableIncome)
-    {
-        this.taxableIncome = taxableIncome;
+
+    public void setGdp(Double gdp) {
+        this.gdp = gdp;
     }
 
-    public Long getTaxableIncome()
-    {
+    public Double getTaxableIncome() {
         return taxableIncome;
     }
-    public void setPaidTax(Long paidTax)
-    {
-        this.paidTax = paidTax;
+
+    public void setTaxableIncome(Double taxableIncome) {
+        this.taxableIncome = taxableIncome;
     }
 
-    public Long getPaidTax()
-    {
+    public Double getPaidTax() {
         return paidTax;
     }
-    public void setMainBusinessIncome(Long mainBusinessIncome)
-    {
-        this.mainBusinessIncome = mainBusinessIncome;
+
+    public void setPaidTax(Double paidTax) {
+        this.paidTax = paidTax;
     }
 
-    public Long getMainBusinessIncome()
-    {
+    public Double getMainBusinessIncome() {
         return mainBusinessIncome;
     }
-    public void setEmployeeNumber(Long employeeNumber)
-    {
-        this.employeeNumber = employeeNumber;
+
+    public void setMainBusinessIncome(Double mainBusinessIncome) {
+        this.mainBusinessIncome = mainBusinessIncome;
     }
 
-    public Long getEmployeeNumber()
-    {
+    public Double getEmployeeNumber() {
         return employeeNumber;
     }
-    public void setProfit(Long profit)
-    {
-        this.profit = profit;
+
+    public void setEmployeeNumber(Double employeeNumber) {
+        this.employeeNumber = employeeNumber;
     }
 
-    public Long getProfit()
-    {
+    public Double getProfit() {
         return profit;
     }
-    public void setOwnerEquity(Long ownerEquity)
-    {
-        this.ownerEquity = ownerEquity;
+
+    public void setProfit(Double profit) {
+        this.profit = profit;
     }
 
-    public Long getOwnerEquity()
-    {
+    public Double getOwnerEquity() {
         return ownerEquity;
     }
-    public void setFunding(Long funding)
-    {
-        this.funding = funding;
+
+    public void setOwnerEquity(Double ownerEquity) {
+        this.ownerEquity = ownerEquity;
     }
 
-    public Long getFunding()
-    {
+    public Double getFunding() {
         return funding;
     }
-    public void setEnergyConsume(Long energyConsume)
-    {
-        this.energyConsume = energyConsume;
+
+    public void setFunding(Double funding) {
+        this.funding = funding;
     }
 
-    public Long getEnergyConsume()
-    {
+    public Double getEnergyConsume() {
         return energyConsume;
     }
 
-    public void setPowerConsume(Long powerConsume)
-    {
-        this.powerConsume = powerConsume;
+    public void setEnergyConsume(Double energyConsume) {
+        this.energyConsume = energyConsume;
     }
 
-    public Long getPowerConsume()
-    {
+    public Double getPowerConsume() {
         return powerConsume;
     }
-    public void setYear(String year)
-    {
-        this.year = year;
+
+    public void setPowerConsume(Double powerConsume) {
+        this.powerConsume = powerConsume;
     }
 
-    public String getYear()
-    {
+    public String getYear() {
         return year;
     }
-    public void setMonth(String month)
-    {
-        this.month = month;
+
+    public void setYear(String year) {
+        this.year = year;
     }
 
-    public String getMonth()
-    {
+    public String getMonth() {
         return month;
     }
 
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("enterpriseName", getEnterpriseName())
-            .append("location", getLocation())
-            .append("code", getCode())
-            .append("mainBusiness", getMainBusiness())
-            .append("landArea", getLandArea())
-            .append("totalIndustrialValue", getTotalIndustrialValue())
-            .append("gdp", getGdp())
-            .append("taxableIncome", getTaxableIncome())
-            .append("paidTax", getPaidTax())
-            .append("mainBusinessIncome", getMainBusinessIncome())
-            .append("employeeNumber", getEmployeeNumber())
-            .append("profit", getProfit())
-            .append("ownerEquity", getOwnerEquity())
-            .append("funding", getFunding())
-            .append("energyConsume", getEnergyConsume())
-                .append("powerConsume", getPowerConsume())
-            .append("year", getYear())
-            .append("month", getMonth())
-            .toString();
+        return "EnterpriseBaseDataYear{" +
+                "id=" + id +
+                ", enterpriseName='" + enterpriseName + '\'' +
+                ", location='" + location + '\'' +
+                ", code='" + code + '\'' +
+                ", mainBusiness='" + mainBusiness + '\'' +
+                ", landArea=" + landArea +
+                ", totalIndustrialValue=" + totalIndustrialValue +
+                ", gdp=" + gdp +
+                ", taxableIncome=" + taxableIncome +
+                ", paidTax=" + paidTax +
+                ", mainBusinessIncome=" + mainBusinessIncome +
+                ", employeeNumber=" + employeeNumber +
+                ", profit=" + profit +
+                ", ownerEquity=" + ownerEquity +
+                ", funding=" + funding +
+                ", energyConsume=" + energyConsume +
+                ", powerConsume=" + powerConsume +
+                ", year='" + year + '\'' +
+                ", month='" + month + '\'' +
+                '}';
     }
 }

enteprise-admin/src/main/java/com/enteprise/growthRate/service/impl/GrowthRateServiceImpl.java

@@ -89,8 +89,8 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
                 //循环企业列表计算季度指标
                 for (EnterpriseDto dto : enterpriseDtos){
                     EnterpriseBaseDataSeason dataSeason = new EnterpriseBaseDataSeason();
-                    Long sum = 0L;
-                    Long oldSum = 0L;
+                    double sum = 0;
+                    double oldSum = 0;
                     dataSeason.setEnterpriseName(dto.getEnterpriseName());
                     dataSeason.setSeason(String.valueOf(season));
                     dataSeason.setYear(String.valueOf(year));
@@ -107,7 +107,7 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
                     }
                     if (oldSum != 0) {
                         //计算同比增速:（今年-去年）/去年
-                        double rate = (double) (sum - oldSum) / oldSum;
+                        double rate = (sum - oldSum) / oldSum;
                         //初始化企业并把该企业的同比增速和其他数据放入list中
                         GrowthRateDto growthRateDto = new GrowthRateDto();
                         growthRateDto.setRate(rate);
@@ -121,8 +121,8 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
             //循环企业列表计算年度指标
             for (EnterpriseDto dto : enterpriseDtos){
                 EnterpriseBaseDataYear dataYear = new EnterpriseBaseDataYear();
-                Long sum = 0L;
-                Long oldSum = 0L;
+                double sum = 0;
+                double oldSum = 0;
                 dataYear.setEnterpriseName(dto.getEnterpriseName());
                 dataYear.setYear(String.valueOf(year));
                 //年度指标获取
@@ -138,7 +138,7 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
                 }
                 if (oldSum != 0 ) {
                     //计算同比增速:（今年-去年）/去年
-                    double rate = (double) (sum - oldSum) / oldSum;
+                    double rate = (sum - oldSum) / oldSum;
                     //初始化企业并把该企业的同比增速和其他数据放入list中
                     GrowthRateDto growthRateDto = new GrowthRateDto();
                     growthRateDto.setRate(rate);

enteprise-admin/src/main/java/com/enteprise/matchAnalysis/service/impl/MatchServiceImpl.java

@@ -31,8 +31,6 @@ public class MatchServiceImpl implements IMatchService {
     @Autowired
     private EnterpriseBaseDataMonthMapper enterpriseBaseDataMonthMapper;
     @Autowired
-    private EnterpriseBaseDataSeasonMapper enterpriseBaseDataSeasonMapper;
-    @Autowired
     private EnterpriseBaseDataYearMapper enterpriseBaseDataYearMapper;
     @Autowired
     private EnterpriseBaseDataTotalMapper enterpriseBaseDataTotalMapper;

enteprise-admin/src/main/java/com/enteprise/season/domain/EnterpriseBaseDataSeason.java

@@ -36,31 +36,31 @@ public class EnterpriseBaseDataSeason extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long landArea;
+    private Double landArea;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long totalIndustrialValue;
+    private Double totalIndustrialValue;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long gdp;
+    private Double gdp;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long taxableIncome;
+    private Double taxableIncome;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long paidTax;
+    private Double paidTax;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long mainBusinessIncome;
+    private Double mainBusinessIncome;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long employeeNumber;
+    private Double employeeNumber;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -72,14 +72,14 @@ public class EnterpriseBaseDataSeason extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long funding;
+    private Double funding;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long energyConsume;
+    private Double energyConsume;
 
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long powerConsume;
+    private Double powerConsume;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -89,201 +89,180 @@ public class EnterpriseBaseDataSeason extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String season;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getEnterpriseName() 
-    {
+    public String getEnterpriseName() {
         return enterpriseName;
     }
-    public void setLocation(String location) 
-    {
-        this.location = location;
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
     }
 
-    public String getLocation() 
-    {
+    public String getLocation() {
         return location;
     }
-    public void setCode(String code) 
-    {
-        this.code = code;
+
+    public void setLocation(String location) {
+        this.location = location;
     }
 
-    public String getCode() 
-    {
+    public String getCode() {
         return code;
     }
-    public void setMainBusiness(String mainBusiness) 
-    {
-        this.mainBusiness = mainBusiness;
+
+    public void setCode(String code) {
+        this.code = code;
     }
 
-    public String getMainBusiness() 
-    {
+    public String getMainBusiness() {
         return mainBusiness;
     }
-    public void setLandArea(Long landArea) 
-    {
-        this.landArea = landArea;
+
+    public void setMainBusiness(String mainBusiness) {
+        this.mainBusiness = mainBusiness;
     }
 
-    public Long getLandArea() 
-    {
+    public Double getLandArea() {
         return landArea;
     }
-    public void setTotalIndustrialValue(Long totalIndustrialValue) 
-    {
-        this.totalIndustrialValue = totalIndustrialValue;
+
+    public void setLandArea(Double landArea) {
+        this.landArea = landArea;
     }
 
-    public Long getTotalIndustrialValue() 
-    {
+    public Double getTotalIndustrialValue() {
         return totalIndustrialValue;
     }
-    public void setGdp(Long gdp) 
-    {
-        this.gdp = gdp;
+
+    public void setTotalIndustrialValue(Double totalIndustrialValue) {
+        this.totalIndustrialValue = totalIndustrialValue;
     }
 
-    public Long getGdp() 
-    {
+    public Double getGdp() {
         return gdp;
     }
-    public void setTaxableIncome(Long taxableIncome) 
-    {
-        this.taxableIncome = taxableIncome;
+
+    public void setGdp(Double gdp) {
+        this.gdp = gdp;
     }
 
-    public Long getTaxableIncome() 
-    {
+    public Double getTaxableIncome() {
         return taxableIncome;
     }
-    public void setPaidTax(Long paidTax) 
-    {
-        this.paidTax = paidTax;
+
+    public void setTaxableIncome(Double taxableIncome) {
+        this.taxableIncome = taxableIncome;
     }
 
-    public Long getPaidTax() 
-    {
+    public Double getPaidTax() {
         return paidTax;
     }
-    public void setMainBusinessIncome(Long mainBusinessIncome) 
-    {
-        this.mainBusinessIncome = mainBusinessIncome;
+
+    public void setPaidTax(Double paidTax) {
+        this.paidTax = paidTax;
     }
 
-    public Long getMainBusinessIncome() 
-    {
+    public Double getMainBusinessIncome() {
         return mainBusinessIncome;
     }
-    public void setEmployeeNumber(Long employeeNumber) 
-    {
-        this.employeeNumber = employeeNumber;
+
+    public void setMainBusinessIncome(Double mainBusinessIncome) {
+        this.mainBusinessIncome = mainBusinessIncome;
     }
 
-    public Long getEmployeeNumber() 
-    {
+    public Double getEmployeeNumber() {
         return employeeNumber;
     }
-    public void setProfit(Long profit) 
-    {
-        this.profit = profit;
+
+    public void setEmployeeNumber(Double employeeNumber) {
+        this.employeeNumber = employeeNumber;
     }
 
-    public Long getProfit() 
-    {
+    public Long getProfit() {
         return profit;
     }
-    public void setOwnerEquity(Long ownerEquity) 
-    {
-        this.ownerEquity = ownerEquity;
+
+    public void setProfit(Long profit) {
+        this.profit = profit;
     }
 
-    public Long getOwnerEquity() 
-    {
+    public Long getOwnerEquity() {
         return ownerEquity;
     }
-    public void setFunding(Long funding) 
-    {
-        this.funding = funding;
+
+    public void setOwnerEquity(Long ownerEquity) {
+        this.ownerEquity = ownerEquity;
     }
 
-    public Long getFunding() 
-    {
+    public Double getFunding() {
         return funding;
     }
-    public void setEnergyConsume(Long energyConsume) 
-    {
-        this.energyConsume = energyConsume;
+
+    public void setFunding(Double funding) {
+        this.funding = funding;
     }
 
-    public Long getEnergyConsume() 
-    {
+    public Double getEnergyConsume() {
         return energyConsume;
     }
 
-    public void setPowerConsume(Long powerConsume)
-    {
-        this.powerConsume = powerConsume;
+    public void setEnergyConsume(Double energyConsume) {
+        this.energyConsume = energyConsume;
     }
 
-    public Long getPowerConsume()
-    {
+    public Double getPowerConsume() {
         return powerConsume;
     }
-    public void setYear(String year) 
-    {
-        this.year = year;
+
+    public void setPowerConsume(Double powerConsume) {
+        this.powerConsume = powerConsume;
     }
 
-    public String getYear() 
-    {
+    public String getYear() {
         return year;
     }
-    public void setSeason(String season)
-    {
-        this.season = season;
+
+    public void setYear(String year) {
+        this.year = year;
     }
 
-    public String getSeason()
-    {
+    public String getSeason() {
         return season;
     }
 
+    public void setSeason(String season) {
+        this.season = season;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("enterpriseName", getEnterpriseName())
-            .append("location", getLocation())
-            .append("code", getCode())
-            .append("mainBusiness", getMainBusiness())
-            .append("landArea", getLandArea())
-            .append("totalIndustrialValue", getTotalIndustrialValue())
-            .append("gdp", getGdp())
-            .append("taxableIncome", getTaxableIncome())
-            .append("paidTax", getPaidTax())
-            .append("mainBusinessIncome", getMainBusinessIncome())
-            .append("employeeNumber", getEmployeeNumber())
-            .append("profit", getProfit())
-            .append("ownerEquity", getOwnerEquity())
-            .append("funding", getFunding())
-            .append("energyConsume", getEnergyConsume())
-                .append("powerConsume", getPowerConsume())
-            .append("year", getYear())
-            .append("season", getSeason())
-            .toString();
+        return "EnterpriseBaseDataSeason{" +
+                "id=" + id +
+                ", enterpriseName='" + enterpriseName + '\'' +
+                ", location='" + location + '\'' +
+                ", code='" + code + '\'' +
+                ", mainBusiness='" + mainBusiness + '\'' +
+                ", landArea=" + landArea +
+                ", totalIndustrialValue=" + totalIndustrialValue +
+                ", gdp=" + gdp +
+                ", taxableIncome=" + taxableIncome +
+                ", paidTax=" + paidTax +
+                ", mainBusinessIncome=" + mainBusinessIncome +
+                ", employeeNumber=" + employeeNumber +
+                ", profit=" + profit +
+                ", ownerEquity=" + ownerEquity +
+                ", funding=" + funding +
+                ", energyConsume=" + energyConsume +
+                ", powerConsume=" + powerConsume +
+                ", year='" + year + '\'' +
+                ", season='" + season + '\'' +
+                '}';
     }
 }