ljx：新增行业数据模糊搜索

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

@@ -46,6 +46,15 @@ public class EnterpriseBaseDataTotalController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('industry_run:industry_run:list')")
+    @GetMapping("/listMOHU")
+    public TableDataInfo listMOHU(EnterpriseBaseDataTotal enterpriseBaseDataTotal)
+    {
+        startPage();
+        List<EnterpriseBaseDataTotal> list = enterpriseBaseDataTotalService.selectEnterpriseBaseDataTotalListMOHU(enterpriseBaseDataTotal);
+        return getDataTable(list);
+    }
+
     /**
      * 导出industry_run列表
      */

enteprise-admin/src/main/java/com/enteprise/industry_run/mapper/EnterpriseBaseDataTotalMapper.java

@@ -29,6 +29,8 @@ public interface EnterpriseBaseDataTotalMapper
      */
     public List<EnterpriseBaseDataTotal> selectEnterpriseBaseDataTotalList(EnterpriseBaseDataTotal enterpriseBaseDataTotal);
 
+    public List<EnterpriseBaseDataTotal> selectEnterpriseBaseDataTotalListMOHU(EnterpriseBaseDataTotal enterpriseBaseDataTotal);
+
     /**
      * 新增industry_run
      * 

enteprise-admin/src/main/java/com/enteprise/industry_run/service/IEnterpriseBaseDataTotalService.java

@@ -27,6 +27,7 @@ public interface IEnterpriseBaseDataTotalService
      */
     public List<EnterpriseBaseDataTotal> selectEnterpriseBaseDataTotalList(EnterpriseBaseDataTotal enterpriseBaseDataTotal);
 
+    public List<EnterpriseBaseDataTotal> selectEnterpriseBaseDataTotalListMOHU(EnterpriseBaseDataTotal enterpriseBaseDataTotal);
     /**
      * 新增industry_run
      * 

enteprise-admin/src/main/java/com/enteprise/industry_run/service/impl/EnterpriseBaseDataTotalServiceImpl.java

@@ -43,6 +43,12 @@ public class EnterpriseBaseDataTotalServiceImpl implements IEnterpriseBaseDataTo
         return enterpriseBaseDataTotalMapper.selectEnterpriseBaseDataTotalList(enterpriseBaseDataTotal);
     }
 
+    @Override
+    public List<EnterpriseBaseDataTotal> selectEnterpriseBaseDataTotalListMOHU(EnterpriseBaseDataTotal enterpriseBaseDataTotal)
+    {
+        return enterpriseBaseDataTotalMapper.selectEnterpriseBaseDataTotalListMOHU(enterpriseBaseDataTotal);
+    }
+
     /**
      * 新增industry_run
      * 

enteprise-admin/src/main/resources/mapper/industry_run/EnterpriseBaseDataTotalMapper.xml

@@ -50,6 +50,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by enterprise_name,year,season,month
     </select>
+
+    <select id="selectEnterpriseBaseDataTotalListMOHU" parameterType="EnterpriseBaseDataTotal" resultMap="EnterpriseBaseDataTotalResult">
+        <include refid="selectEnterpriseBaseDataTotalVo"/>
+        <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>
+            <if test="totalIndustrialValue != null "> and total_industrial_value = #{totalIndustrialValue}</if>
+            <if test="taxableIncome != null "> and taxable_income = #{taxableIncome}</if>
+            <if test="paidTax != null "> and paid_tax = #{paidTax}</if>
+            <if test="funding != null "> and funding = #{funding}</if>
+            <if test="energyConsume != null "> and energy_consume = #{energyConsume}</if>
+            <if test="powerConsume != null "> and power_consume = #{powerConsume}</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="season != null  and season != ''"> and season = #{season}</if>
+            <if test="month != null  and month != ''"> and month = #{month}</if>
+        </where>
+        order by enterprise_name,year,season,month
+    </select>
     
     <select id="selectEnterpriseBaseDataTotalByEnterpriseName" parameterType="String" resultMap="EnterpriseBaseDataTotalResult">
         <include refid="selectEnterpriseBaseDataTotalVo"/>