添加得分水平分析查询接口数据（中文数据）

enteprise-admin/src/main/java/com/enteprise/industry_oveview/controller/IndustryOverviewController.java

@@ -56,7 +56,7 @@ public class IndustryOverviewController extends BaseController
     @GetMapping("/i_list")
     public TableDataInfo iList()
     {
-        startPage();
+        //startPage();
         List<IndustryCount> list = industryOverviewService.selectIndustryCountList();
         return getDataTable(list);
     }

enteprise-admin/src/main/java/com/enteprise/industry_oveview/service/impl/IndustryOverviewServiceImpl.java

@@ -61,6 +61,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
 
     @Override
     public List<IndustryCount> selectIndustryCountList() {
+        //获取前十排名
         List<IndustryCount> collect = industryOverviewMapper.selectIndustryCount().stream().limit(10).collect(Collectors.toList());
         IndustryCount industryCount = new IndustryCount();
         //计算企业剩余数
@@ -69,6 +70,7 @@ public class IndustryOverviewServiceImpl implements IIndustryOverviewService
         List<Enterprise> enterprises = enterpriseMapper.selectEnterpriseList(new Enterprise());
         int i = enterprises.size() + 1 - collect.stream().mapToInt(IndustryCount::getNumber).sum();
         industryCount.setNumber(i);
+        //合并输出
         collect.add(industryCount);
         return collect;
     }

enteprise-admin/src/main/java/com/enteprise/score/domain/Score.java

@@ -7,9 +7,9 @@ import com.enteprise.common.core.domain.BaseEntity;
 
 /**
  * score对象 score
- * 
+ *
  * @author ruoyi
- * @date 2024-08-30
+ * @date 2024-11-13
  */
 public class Score extends BaseEntity
 {
@@ -36,50 +36,99 @@ public class Score extends BaseEntity
 
     /** 用地面积得分 */
     @Excel(name = "用地面积得分")
-    private Double landAreaScore;
+    private Long landAreaScore;
 
     /** 工业总产值得分 */
     @Excel(name = "工业总产值得分")
-    private Double totalIndustrialValueScore;
+    private Long totalIndustrialValueScore;
 
     /** 工业增加值得分 */
     @Excel(name = "工业增加值得分")
-    private Double gdpScore;
+    private Long gdpScore;
 
     /** 应税收入得分 */
     @Excel(name = "应税收入得分")
-    private Double taxableIncomeScore;
+    private Long taxableIncomeScore;
 
     /** 实缴税金得分 */
     @Excel(name = "实缴税金得分")
-    private Double paidTaxScore;
+    private Long paidTaxScore;
 
     /** 主营业务收入得分 */
     @Excel(name = "主营业务收入得分")
-    private Double mainBusinessIncomeScore;
+    private Long mainBusinessIncomeScore;
 
     /** 从业人员数得分 */
     @Excel(name = "从业人员数得分")
-    private Double employeeNumberScore;
+    private Long employeeNumberScore;
 
     /** 利润总额得分 */
     @Excel(name = "利润总额得分")
-    private Double profitScore;
+    private Long profitScore;
 
     /** 所有者权益得分 */
     @Excel(name = "所有者权益得分")
-    private Double ownerEquityScore;
+    private Long ownerEquityScore;
 
     /** 研发经费得分 */
     @Excel(name = "研发经费得分")
-    private Double fundingScore;
+    private Long fundingScore;
+
+    /** 电力消费得分 */
+    @Excel(name = "电力消费得分")
+    private Long powerConsumeScore;
 
     /** 能源消费量得分 */
     @Excel(name = "能源消费量得分")
-    private Double energyConsumeScore;
+    private Long energyConsumeScore;
+
+    /** 工业总产值得分 */
+    @Excel(name = "工业总产值得分")
+    private Long totalIndustrialValuePrecent;
+
+    /** 应税收入得分 */
+    @Excel(name = "应税收入得分")
+    private Long taxableIncomePrecent;
+
+    /** 实缴税金得分 */
+    @Excel(name = "实缴税金得分")
+    private Long paidTaxPrecent;
+
+    /** 研发经费得分 */
+    @Excel(name = "研发经费得分")
+    private Long fundingPrecent;
 
-    @Excel(name = "电力消费量得分")
-    private Double powerConsumeScore;
+    /** 电力消费得分 */
+    @Excel(name = "电力消费得分")
+    private Long powerConsumePrecent;
+
+    /** 能源消费量得分 */
+    @Excel(name = "能源消费量得分")
+    private Long energyConsumePrecent;
+
+    /** 主营业务活动得分 */
+    @Excel(name = "主营业务活动得分")
+    private String totalIndustrialValueLevel;
+
+    /** 主营业务活动得分 */
+    @Excel(name = "主营业务活动得分")
+    private String taxableIncomeLevel;
+
+    /** 主营业务活动得分 */
+    @Excel(name = "主营业务活动得分")
+    private String paidTaxLevel;
+
+    /** 主营业务活动得分 */
+    @Excel(name = "主营业务活动得分")
+    private String energyConsumeLevel;
+
+    /** 主营业务活动得分 */
+    @Excel(name = "主营业务活动得分")
+    private String fundingLevel;
+
+    /** 主营业务活动得分 */
+    @Excel(name = "主营业务活动得分")
+    private String powerConsumeLevel;
 
     /** 年份 */
     @Excel(name = "年份")
@@ -98,166 +147,273 @@ public class Score extends BaseEntity
     {
         return id;
     }
-    public void setEnterpriseName(String enterpriseName) 
+    public void setEnterpriseName(String enterpriseName)
     {
         this.enterpriseName = enterpriseName;
     }
 
-    public String getEnterpriseName() 
+    public String getEnterpriseName()
     {
         return enterpriseName;
     }
-    public void setLocation(String location) 
+    public void setLocation(String location)
     {
         this.location = location;
     }
 
-    public String getLocation() 
+    public String getLocation()
     {
         return location;
     }
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
-    public void setMainBusinessScore(String mainBusinessScore) 
+    public void setMainBusinessScore(String mainBusinessScore)
     {
         this.mainBusinessScore = mainBusinessScore;
     }
 
-    public String getMainBusinessScore() 
+    public String getMainBusinessScore()
     {
         return mainBusinessScore;
     }
-    public void setLandAreaScore(Double landAreaScore) 
+    public void setLandAreaScore(Long landAreaScore)
     {
         this.landAreaScore = landAreaScore;
     }
 
-    public Double getLandAreaScore() 
+    public Long getLandAreaScore()
     {
         return landAreaScore;
     }
-    public void setTotalIndustrialValueScore(Double totalIndustrialValueScore) 
+    public void setTotalIndustrialValueScore(Long totalIndustrialValueScore)
     {
         this.totalIndustrialValueScore = totalIndustrialValueScore;
     }
 
-    public Double getTotalIndustrialValueScore() 
+    public Long getTotalIndustrialValueScore()
     {
         return totalIndustrialValueScore;
     }
-    public void setGdpScore(Double gdpScore) 
+    public void setGdpScore(Long gdpScore)
     {
         this.gdpScore = gdpScore;
     }
 
-    public Double getGdpScore() 
+    public Long getGdpScore()
     {
         return gdpScore;
     }
-    public void setTaxableIncomeScore(Double taxableIncomeScore) 
+    public void setTaxableIncomeScore(Long taxableIncomeScore)
     {
         this.taxableIncomeScore = taxableIncomeScore;
     }
 
-    public Double getTaxableIncomeScore() 
+    public Long getTaxableIncomeScore()
     {
         return taxableIncomeScore;
     }
-    public void setPaidTaxScore(Double paidTaxScore) 
+    public void setPaidTaxScore(Long paidTaxScore)
     {
         this.paidTaxScore = paidTaxScore;
     }
 
-    public Double getPaidTaxScore() 
+    public Long getPaidTaxScore()
     {
         return paidTaxScore;
     }
-    public void setMainBusinessIncomeScore(Double mainBusinessIncomeScore) 
+    public void setMainBusinessIncomeScore(Long mainBusinessIncomeScore)
     {
         this.mainBusinessIncomeScore = mainBusinessIncomeScore;
     }
 
-    public Double getMainBusinessIncomeScore() 
+    public Long getMainBusinessIncomeScore()
     {
         return mainBusinessIncomeScore;
     }
-    public void setEmployeeNumberScore(Double employeeNumberScore) 
+    public void setEmployeeNumberScore(Long employeeNumberScore)
     {
         this.employeeNumberScore = employeeNumberScore;
     }
 
-    public Double getEmployeeNumberScore() 
+    public Long getEmployeeNumberScore()
     {
         return employeeNumberScore;
     }
-    public void setProfitScore(Double profitScore) 
+    public void setProfitScore(Long profitScore)
     {
         this.profitScore = profitScore;
     }
 
-    public Double getProfitScore() 
+    public Long getProfitScore()
     {
         return profitScore;
     }
-    public void setOwnerEquityScore(Double ownerEquityScore) 
+    public void setOwnerEquityScore(Long ownerEquityScore)
     {
         this.ownerEquityScore = ownerEquityScore;
     }
 
-    public Double getOwnerEquityScore() 
+    public Long getOwnerEquityScore()
     {
         return ownerEquityScore;
     }
-    public void setFundingScore(Double fundingScore) 
+    public void setFundingScore(Long fundingScore)
     {
         this.fundingScore = fundingScore;
     }
 
-    public Double getFundingScore() 
+    public Long getFundingScore()
     {
         return fundingScore;
     }
-    public void setEnergyConsumeScore(Double energyConsumeScore) 
+    public void setPowerConsumeScore(Long powerConsumeScore)
+    {
+        this.powerConsumeScore = powerConsumeScore;
+    }
+
+    public Long getPowerConsumeScore()
+    {
+        return powerConsumeScore;
+    }
+    public void setEnergyConsumeScore(Long energyConsumeScore)
     {
         this.energyConsumeScore = energyConsumeScore;
     }
 
-    public Double getEnergyConsumeScore() 
+    public Long getEnergyConsumeScore()
     {
         return energyConsumeScore;
     }
+    public void setTotalIndustrialValuePrecent(Long totalIndustrialValuePrecent)
+    {
+        this.totalIndustrialValuePrecent = totalIndustrialValuePrecent;
+    }
 
-    public void setPowerConsumeScore(Double powerConsumeScore)
+    public Long getTotalIndustrialValuePrecent()
     {
-        this.powerConsumeScore = powerConsumeScore;
+        return totalIndustrialValuePrecent;
+    }
+    public void setTaxableIncomePrecent(Long taxableIncomePrecent)
+    {
+        this.taxableIncomePrecent = taxableIncomePrecent;
     }
 
-    public Double getPowerConsumeScore()
+    public Long getTaxableIncomePrecent()
     {
-        return powerConsumeScore;
+        return taxableIncomePrecent;
+    }
+    public void setPaidTaxPrecent(Long paidTaxPrecent)
+    {
+        this.paidTaxPrecent = paidTaxPrecent;
+    }
+
+    public Long getPaidTaxPrecent()
+    {
+        return paidTaxPrecent;
+    }
+    public void setFundingPrecent(Long fundingPrecent)
+    {
+        this.fundingPrecent = fundingPrecent;
+    }
+
+    public Long getFundingPrecent()
+    {
+        return fundingPrecent;
+    }
+    public void setPowerConsumePrecent(Long powerConsumePrecent)
+    {
+        this.powerConsumePrecent = powerConsumePrecent;
+    }
+
+    public Long getPowerConsumePrecent()
+    {
+        return powerConsumePrecent;
+    }
+    public void setEnergyConsumePrecent(Long energyConsumePrecent)
+    {
+        this.energyConsumePrecent = energyConsumePrecent;
+    }
+
+    public Long getEnergyConsumePrecent()
+    {
+        return energyConsumePrecent;
+    }
+    public void setTotalIndustrialValueLevel(String totalIndustrialValueLevel)
+    {
+        this.totalIndustrialValueLevel = totalIndustrialValueLevel;
+    }
+
+    public String getTotalIndustrialValueLevel()
+    {
+        return totalIndustrialValueLevel;
+    }
+    public void setTaxableIncomeLevel(String taxableIncomeLevel)
+    {
+        this.taxableIncomeLevel = taxableIncomeLevel;
+    }
+
+    public String getTaxableIncomeLevel()
+    {
+        return taxableIncomeLevel;
+    }
+    public void setPaidTaxLevel(String paidTaxLevel)
+    {
+        this.paidTaxLevel = paidTaxLevel;
+    }
+
+    public String getPaidTaxLevel()
+    {
+        return paidTaxLevel;
+    }
+    public void setEnergyConsumeLevel(String energyConsumeLevel)
+    {
+        this.energyConsumeLevel = energyConsumeLevel;
+    }
+
+    public String getEnergyConsumeLevel()
+    {
+        return energyConsumeLevel;
+    }
+    public void setFundingLevel(String fundingLevel)
+    {
+        this.fundingLevel = fundingLevel;
+    }
+
+    public String getFundingLevel()
+    {
+        return fundingLevel;
+    }
+    public void setPowerConsumeLevel(String powerConsumeLevel)
+    {
+        this.powerConsumeLevel = powerConsumeLevel;
+    }
+
+    public String getPowerConsumeLevel()
+    {
+        return powerConsumeLevel;
     }
-    public void setYear(String year) 
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public String getYear() 
+    public String getYear()
     {
         return year;
     }
-    public void setMonth(String month) 
+    public void setMonth(String month)
     {
         this.month = month;
     }
 
-    public String getMonth() 
+    public String getMonth()
     {
         return month;
     }
@@ -265,24 +421,37 @@ public class Score extends BaseEntity
     @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("mainBusinessScore", getMainBusinessScore())
-            .append("landAreaScore", getLandAreaScore())
-            .append("totalIndustrialValueScore", getTotalIndustrialValueScore())
-            .append("gdpScore", getGdpScore())
-            .append("taxableIncomeScore", getTaxableIncomeScore())
-            .append("paidTaxScore", getPaidTaxScore())
-            .append("mainBusinessIncomeScore", getMainBusinessIncomeScore())
-            .append("employeeNumberScore", getEmployeeNumberScore())
-            .append("profitScore", getProfitScore())
-            .append("ownerEquityScore", getOwnerEquityScore())
-            .append("fundingScore", getFundingScore())
-            .append("energyConsumeScore", getEnergyConsumeScore())
-            .append("year", getYear())
-            .append("month", getMonth())
-            .toString();
+                .append("id", getId())
+                .append("enterpriseName", getEnterpriseName())
+                .append("location", getLocation())
+                .append("code", getCode())
+                .append("mainBusinessScore", getMainBusinessScore())
+                .append("landAreaScore", getLandAreaScore())
+                .append("totalIndustrialValueScore", getTotalIndustrialValueScore())
+                .append("gdpScore", getGdpScore())
+                .append("taxableIncomeScore", getTaxableIncomeScore())
+                .append("paidTaxScore", getPaidTaxScore())
+                .append("mainBusinessIncomeScore", getMainBusinessIncomeScore())
+                .append("employeeNumberScore", getEmployeeNumberScore())
+                .append("profitScore", getProfitScore())
+                .append("ownerEquityScore", getOwnerEquityScore())
+                .append("fundingScore", getFundingScore())
+                .append("powerConsumeScore", getPowerConsumeScore())
+                .append("energyConsumeScore", getEnergyConsumeScore())
+                .append("totalIndustrialValuePrecent", getTotalIndustrialValuePrecent())
+                .append("taxableIncomePrecent", getTaxableIncomePrecent())
+                .append("paidTaxPrecent", getPaidTaxPrecent())
+                .append("fundingPrecent", getFundingPrecent())
+                .append("powerConsumePrecent", getPowerConsumePrecent())
+                .append("energyConsumePrecent", getEnergyConsumePrecent())
+                .append("totalIndustrialValueLevel", getTotalIndustrialValueLevel())
+                .append("taxableIncomeLevel", getTaxableIncomeLevel())
+                .append("paidTaxLevel", getPaidTaxLevel())
+                .append("energyConsumeLevel", getEnergyConsumeLevel())
+                .append("fundingLevel", getFundingLevel())
+                .append("powerConsumeLevel", getPowerConsumeLevel())
+                .append("year", getYear())
+                .append("month", getMonth())
+                .toString();
     }
 }

enteprise-admin/src/main/resources/mapper/score/ScoreMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.enteprise.score.mapper.ScoreMapper">
-    
+
     <resultMap type="Score" id="ScoreResult">
         <result property="id"    column="id"    />
         <result property="enterpriseName"    column="enterprise_name"    />
@@ -20,19 +20,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="profitScore"    column="profit_score"    />
         <result property="ownerEquityScore"    column="owner_equity_score"    />
         <result property="fundingScore"    column="funding_score"    />
-        <result property="energyConsumeScore"    column="energy_consume_score"    />
         <result property="powerConsumeScore"    column="power_consume_score"    />
+        <result property="energyConsumeScore"    column="energy_consume_score"    />
+        <result property="totalIndustrialValuePrecent"    column="total_industrial_value_precent"    />
+        <result property="taxableIncomePrecent"    column="taxable_income_precent"    />
+        <result property="paidTaxPrecent"    column="paid_tax_precent"    />
+        <result property="fundingPrecent"    column="funding_precent"    />
+        <result property="powerConsumePrecent"    column="power_consume_precent"    />
+        <result property="energyConsumePrecent"    column="energy_consume_precent"    />
+        <result property="totalIndustrialValueLevel"    column="total_industrial_value_level"    />
+        <result property="taxableIncomeLevel"    column="taxable_income_level"    />
+        <result property="paidTaxLevel"    column="paid_tax_level"    />
+        <result property="energyConsumeLevel"    column="energy_consume_level"    />
+        <result property="fundingLevel"    column="funding_level"    />
+        <result property="powerConsumeLevel"    column="power_consume_level"    />
         <result property="year"    column="year"    />
         <result property="month"    column="month"    />
     </resultMap>
 
     <sql id="selectScoreVo">
-        select id, enterprise_name, location, code, main_business_score, land_area_score, total_industrial_value_score, gdp_score, taxable_income_score, paid_tax_score, main_business_income_score, employee_number_score, profit_score, owner_equity_score, funding_score, energy_consume_score, power_consume_score, year, month from score
+        select id, enterprise_name, location, code, main_business_score, land_area_score, total_industrial_value_score, gdp_score, taxable_income_score, paid_tax_score, main_business_income_score, employee_number_score, profit_score, owner_equity_score, funding_score, power_consume_score, energy_consume_score, total_industrial_value_precent, taxable_income_precent, paid_tax_precent, funding_precent, power_consume_precent, energy_consume_precent, total_industrial_value_level, taxable_income_level, paid_tax_level, energy_consume_level, funding_level, power_consume_level, year, month from score
     </sql>
 
     <select id="selectScoreList" parameterType="Score" resultMap="ScoreResult">
         <include refid="selectScoreVo"/>
-        <where>  
+        <where>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="location != null  and location != ''"> and location = #{location}</if>
             <if test="code != null  and code != ''"> and code = #{code}</if>
@@ -47,13 +59,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="profitScore != null "> and profit_score = #{profitScore}</if>
             <if test="ownerEquityScore != null "> and owner_equity_score = #{ownerEquityScore}</if>
             <if test="fundingScore != null "> and funding_score = #{fundingScore}</if>
-            <if test="energyConsumeScore != null "> and energy_consume_score = #{energyConsumeScore}</if>
             <if test="powerConsumeScore != null "> and power_consume_score = #{powerConsumeScore}</if>
+            <if test="energyConsumeScore != null "> and energy_consume_score = #{energyConsumeScore}</if>
+            <if test="totalIndustrialValuePrecent != null "> and total_industrial_value_precent = #{totalIndustrialValuePrecent}</if>
+            <if test="taxableIncomePrecent != null "> and taxable_income_precent = #{taxableIncomePrecent}</if>
+            <if test="paidTaxPrecent != null "> and paid_tax_precent = #{paidTaxPrecent}</if>
+            <if test="fundingPrecent != null "> and funding_precent = #{fundingPrecent}</if>
+            <if test="powerConsumePrecent != null "> and power_consume_precent = #{powerConsumePrecent}</if>
+            <if test="energyConsumePrecent != null "> and energy_consume_precent = #{energyConsumePrecent}</if>
+            <if test="totalIndustrialValueLevel != null  and totalIndustrialValueLevel != ''"> and total_industrial_value_level = #{totalIndustrialValueLevel}</if>
+            <if test="taxableIncomeLevel != null  and taxableIncomeLevel != ''"> and taxable_income_level = #{taxableIncomeLevel}</if>
+            <if test="paidTaxLevel != null  and paidTaxLevel != ''"> and paid_tax_level = #{paidTaxLevel}</if>
+            <if test="energyConsumeLevel != null  and energyConsumeLevel != ''"> and energy_consume_level = #{energyConsumeLevel}</if>
+            <if test="fundingLevel != null  and fundingLevel != ''"> and funding_level = #{fundingLevel}</if>
+            <if test="powerConsumeLevel != null  and powerConsumeLevel != ''"> and power_consume_level = #{powerConsumeLevel}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="month != null  and month != ''"> and month = #{month}</if>
         </where>
     </select>
-    
+
     <select id="selectScoreById" parameterType="Long" resultMap="ScoreResult">
         <include refid="selectScoreVo"/>
         where id = #{id}
@@ -62,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertScore" parameterType="Score" useGeneratedKeys="true" keyProperty="id">
         insert into score
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
             <if test="location != null">location,</if>
             <if test="code != null">code,</if>
             <if test="mainBusinessScore != null">main_business_score,</if>
@@ -76,12 +100,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="profitScore != null">profit_score,</if>
             <if test="ownerEquityScore != null">owner_equity_score,</if>
             <if test="fundingScore != null">funding_score,</if>
+            <if test="powerConsumeScore != null">power_consume_score,</if>
             <if test="energyConsumeScore != null">energy_consume_score,</if>
-            <if test="year != null and year != ''">year,</if>
+            <if test="totalIndustrialValuePrecent != null">total_industrial_value_precent,</if>
+            <if test="taxableIncomePrecent != null">taxable_income_precent,</if>
+            <if test="paidTaxPrecent != null">paid_tax_precent,</if>
+            <if test="fundingPrecent != null">funding_precent,</if>
+            <if test="powerConsumePrecent != null">power_consume_precent,</if>
+            <if test="energyConsumePrecent != null">energy_consume_precent,</if>
+            <if test="totalIndustrialValueLevel != null">total_industrial_value_level,</if>
+            <if test="taxableIncomeLevel != null">taxable_income_level,</if>
+            <if test="paidTaxLevel != null">paid_tax_level,</if>
+            <if test="energyConsumeLevel != null">energy_consume_level,</if>
+            <if test="fundingLevel != null">funding_level,</if>
+            <if test="powerConsumeLevel != null">power_consume_level,</if>
+            <if test="year != null">year,</if>
             <if test="month != null">month,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
             <if test="location != null">#{location},</if>
             <if test="code != null">#{code},</if>
             <if test="mainBusinessScore != null">#{mainBusinessScore},</if>
@@ -95,17 +132,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="profitScore != null">#{profitScore},</if>
             <if test="ownerEquityScore != null">#{ownerEquityScore},</if>
             <if test="fundingScore != null">#{fundingScore},</if>
-            <if test="energyConsumeScore != null">#{energyConsumeScore},</if>
             <if test="powerConsumeScore != null">#{powerConsumeScore},</if>
-            <if test="year != null and year != ''">#{year},</if>
+            <if test="energyConsumeScore != null">#{energyConsumeScore},</if>
+            <if test="totalIndustrialValuePrecent != null">#{totalIndustrialValuePrecent},</if>
+            <if test="taxableIncomePrecent != null">#{taxableIncomePrecent},</if>
+            <if test="paidTaxPrecent != null">#{paidTaxPrecent},</if>
+            <if test="fundingPrecent != null">#{fundingPrecent},</if>
+            <if test="powerConsumePrecent != null">#{powerConsumePrecent},</if>
+            <if test="energyConsumePrecent != null">#{energyConsumePrecent},</if>
+            <if test="totalIndustrialValueLevel != null">#{totalIndustrialValueLevel},</if>
+            <if test="taxableIncomeLevel != null">#{taxableIncomeLevel},</if>
+            <if test="paidTaxLevel != null">#{paidTaxLevel},</if>
+            <if test="energyConsumeLevel != null">#{energyConsumeLevel},</if>
+            <if test="fundingLevel != null">#{fundingLevel},</if>
+            <if test="powerConsumeLevel != null">#{powerConsumeLevel},</if>
+            <if test="year != null">#{year},</if>
             <if test="month != null">#{month},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateScore" parameterType="Score">
         update score
         <trim prefix="SET" suffixOverrides=",">
-            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
             <if test="location != null">location = #{location},</if>
             <if test="code != null">code = #{code},</if>
             <if test="mainBusinessScore != null">main_business_score = #{mainBusinessScore},</if>
@@ -119,9 +168,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="profitScore != null">profit_score = #{profitScore},</if>
             <if test="ownerEquityScore != null">owner_equity_score = #{ownerEquityScore},</if>
             <if test="fundingScore != null">funding_score = #{fundingScore},</if>
-            <if test="energyConsumeScore != null">energy_consume_score = #{energyConsumeScore},</if>
             <if test="powerConsumeScore != null">power_consume_score = #{powerConsumeScore},</if>
-            <if test="year != null and year != ''">year = #{year},</if>
+            <if test="energyConsumeScore != null">energy_consume_score = #{energyConsumeScore},</if>
+            <if test="totalIndustrialValuePrecent != null">total_industrial_value_precent = #{totalIndustrialValuePrecent},</if>
+            <if test="taxableIncomePrecent != null">taxable_income_precent = #{taxableIncomePrecent},</if>
+            <if test="paidTaxPrecent != null">paid_tax_precent = #{paidTaxPrecent},</if>
+            <if test="fundingPrecent != null">funding_precent = #{fundingPrecent},</if>
+            <if test="powerConsumePrecent != null">power_consume_precent = #{powerConsumePrecent},</if>
+            <if test="energyConsumePrecent != null">energy_consume_precent = #{energyConsumePrecent},</if>
+            <if test="totalIndustrialValueLevel != null">total_industrial_value_level = #{totalIndustrialValueLevel},</if>
+            <if test="taxableIncomeLevel != null">taxable_income_level = #{taxableIncomeLevel},</if>
+            <if test="paidTaxLevel != null">paid_tax_level = #{paidTaxLevel},</if>
+            <if test="energyConsumeLevel != null">energy_consume_level = #{energyConsumeLevel},</if>
+            <if test="fundingLevel != null">funding_level = #{fundingLevel},</if>
+            <if test="powerConsumeLevel != null">power_consume_level = #{powerConsumeLevel},</if>
+            <if test="year != null">year = #{year},</if>
             <if test="month != null">month = #{month},</if>
         </trim>
         where id = #{id}
@@ -132,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteScoreByIds" parameterType="String">
-        delete from score where id in 
+        delete from score where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>