修改

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java

@@ -27,7 +27,7 @@ public class BsSgcSzFxwz extends BaseEntity
     /** 水闸id */
     @Excel(name = "水闸id")
     @ApiModelProperty("水闸id")
-    private String wagaId;
+    private String wagaCode;
 
     /** 物资名称 */
     @Excel(name = "物资名称")

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java

@@ -19,7 +19,7 @@ public interface BsSgcSzQqhjMapper extends BaseMapper<BsSgcSzQqhj> {
     List<BsSgcSzQqhj> getList(@Param("id") String id,
                               @Param("wagaName") String wagaName,
                               @Param("wagaType") String wagaType,
-                              @Param("wagaId") String wagaId,
+                              @Param("wagaCode") String wagaCode,
                               @Param("adcd") String adcd,
                               @Param("orderBy") String orderBy,
                               @Param("pageNum") int pageNum,

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml

@@ -12,7 +12,7 @@
                sj.adcd,
                sq.*
         from bs_sgc_sz_qqhj sq
-                 left join bs_sgc_sz_safe_jbxx sj on sq.waga_id = sj.id
+                 left join bs_sgc_sz_safe_jbxx sj on sq.waga_code = sj.waga_code
     </sql>
 
 
@@ -34,8 +34,8 @@
             <if test="wagaName!=null and wagaName!=''">
                 and waga_name like concat('%',#{wagaName},'%')
             </if>
-            <if test="wagaId!=null and wagaId!=''">
-                and waga_id =#{wagaId}
+            <if test="wagaCode!=null and wagaCode!=''">
+                and waga_code =#{wagaCode}
             </if>
             <if test="wagaType!=null and wagaType!=''">
                 and waga_type=#{wagaType}