diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java index 5ede0173..077c5123 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java @@ -53,7 +53,10 @@ public interface DfSuperviseTaskMapper extends BaseMapper { WHERE("rw.name LIKE CONCAT('%',#{dto.name},'%')"); } if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) { - WHERE("gl.ENGINEERING_MANAGEMENT_UNIT = #{dto.engineeringManagementUnit}"); + WHERE("gl.ENGINEERING_MANAGEMENT_UNIT like concat('%', #{dto.engineeringManagementUnit}, '%')"); + } + if(StringUtils.isNotBlank(dto.getDikeName())){ + WHERE("xx.dike_name LIKE CONCAT('%',#{dto.dikeName},'%')"); } } ORDER_BY("rw.done_time asc", "rw.update_time DESC"); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java index 72dbc382..d3a82aa0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java @@ -52,7 +52,10 @@ public interface SzSuperviseTaskMapper extends BaseMapper { WHERE("rw.name LIKE CONCAT('%',#{dto.name},'%')"); } if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) { - WHERE("gl.ENGINEERING_MANAGEMENT_UNIT = #{dto.engineeringManagementUnit}"); + WHERE("gl.ENGINEERING_MANAGEMENT_UNIT like concat('%', #{dto.engineeringManagementUnit}, '%')"); + } + if(StringUtils.isNotBlank(dto.getWagaName())){ + WHERE("xx.waga_name LIKE CONCAT('%',#{dto.wagaName},'%')"); } } ORDER_BY("rw.done_time asc", "rw.update_time DESC");