修改水源导出携带参数

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
-    List<WaterResourceForExportDto> exportToExcel(@Param("isDelete")Boolean isDelete, @Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
+    List<WaterResourceForExportDto> exportToExcel(@Param("isDelete")Boolean isDelete, @Param("name")String name, @Param("equipCateGoryCode")String equipCateGoryCode, @Param("bizOrgCode")String bizOrgCode);
 
 
     /***

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -72,8 +72,8 @@
         <if test='name!=null and name!=""'>
             and r.name  like concat('%',#{name}, '%')
         </if>
-        <if test='resourceType!=null and resourceType!=""'>
-            and r.resource_type= #{resourceType}
+        <if test='equipCateGoryCode!=null and equipCateGoryCode!=""'>
+            and r.equip_category_code = #{equipCateGoryCode}
         </if>
         <if test='bizOrgCode !=null and bizOrgCode!=""'>
             and r.biz_org_code like concat('%',#{bizOrgCode}, '%')

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -285,7 +285,7 @@ public class ExcelServiceImpl {
 			List<WaterResourceForExportDto> waterResourceDtoList = null;
 			if(par.size()>0) {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,par.containsKey("name")?par.get("name").toString():null,
-						par.containsKey("resourceType")?par.get("resourceType").toString():null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
+						par.containsKey("equipCateGoryCode")?par.get("equipCateGoryCode").toString():null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}else{
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,null,null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}