电站管理添加筛选

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -7,6 +7,7 @@
     b.initiate_status,
     b.contract_lock_id,
     hygf_peasant_household.regional_companies_code,
+    hygf_peasant_household.regional_companies_name,
     hygf_peasant_household.developer_code,
     hygf_peasant_household.developer_user_id
     from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from  hygf_household_contract where   hygf_household_contract.status !='已作废'
@@ -21,7 +22,10 @@
         and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%")
     </if>
     <if test="serviceAgent!=null and serviceAgent!=''">
-        and hygf_power_station.service_agent=#{serviceAgent}
+        and hygf_power_station.service_agent like concat(concat("%",#{serviceAgent}),"%")
+    </if>
+    <if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
+        and hygf_peasant_household.regional_companies_name like concat(concat("%",#{regionalCompaniesName}),"%")
     </if>
     ORDER BY hygf_power_station.rec_date desc
     ) a