Merge remote-tracking branch 'origin/master'

enteprise-admin/src/main/java/com/enteprise/enterprise/controller/EnterpriseController.java

@@ -23,7 +23,7 @@ import com.enteprise.common.core.page.TableDataInfo;
 
 /**
  * enterpriseController
- * 
+ *
  * @author ruoyi
  * @date 2024-08-30
  */
@@ -101,4 +101,13 @@ public class EnterpriseController extends BaseController
     {
         return toAjax(enterpriseService.deleteEnterpriseByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('enterprise:enterprise:alllist')")
+    @GetMapping("/alllist")
+    public TableDataInfo alllist(Enterprise enterprise)
+    {
+        List<Enterprise> list = enterpriseService.selectEnterpriseList(enterprise);
+        return getDataTable(list);
+    }
+
 }

enteprise-admin/src/main/java/com/enteprise/industry/controller/IndustryController.java

@@ -23,7 +23,7 @@ import com.enteprise.common.core.page.TableDataInfo;
 
 /**
  * industryController
- * 
+ *
  * @author ruoyi
  * @date 2024-08-30
  */
@@ -101,4 +101,12 @@ public class IndustryController extends BaseController
     {
         return toAjax(industryService.deleteIndustryByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('industry:industry:alllist')")
+    @GetMapping("/alllist")
+    public TableDataInfo alllist(Industry industry)
+    {
+        List<Industry> list = industryService.selectIndustryList(industry);
+        return getDataTable(list);
+    }
 }

enteprise-admin/src/main/java/com/enteprise/industry_run/controller/EnterpriseBaseDataTotalController.java

@@ -23,7 +23,7 @@ import com.enteprise.common.core.page.TableDataInfo;
 
 /**
  * industry_runController
- * 
+ *
  * @author ruoyi
  * @date 2024-11-13
  */
@@ -101,4 +101,13 @@ public class EnterpriseBaseDataTotalController extends BaseController
     {
         return toAjax(enterpriseBaseDataTotalService.deleteEnterpriseBaseDataTotalByEnterpriseNames(enterpriseNames));
     }
+
+    @PreAuthorize("@ss.hasPermi('industry_run:industry_run:alllist')")
+    @GetMapping("/alllist")
+    public TableDataInfo alllist(EnterpriseBaseDataTotal enterpriseBaseDataTotal)
+    {
+//        startPage();
+        List<EnterpriseBaseDataTotal> list = enterpriseBaseDataTotalService.selectEnterpriseBaseDataTotalList(enterpriseBaseDataTotal);
+        return getDataTable(list);
+    }
 }

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

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

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

@@ -22,12 +22,12 @@
         <result property="fundingScore"    column="funding_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="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"    />
@@ -61,12 +61,12 @@
             <if test="fundingScore != null "> and funding_score = #{fundingScore}</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="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>
@@ -102,12 +102,12 @@
             <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="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="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>
@@ -134,12 +134,12 @@
             <if test="fundingScore != null">#{fundingScore},</if>
             <if test="powerConsumeScore != null">#{powerConsumeScore},</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="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>
@@ -170,12 +170,12 @@
             <if test="fundingScore != null">funding_score = #{fundingScore},</if>
             <if test="powerConsumeScore != null">power_consume_score = #{powerConsumeScore},</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="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>
@@ -198,4 +198,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>