我的电站列表添加筛选条件

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdPageDto.java

@@ -7,4 +7,6 @@ import lombok.Data;
 public class PeasantHouseholdPageDto extends Page<PeasantHouseholdPageDto> {
     private String nhUserId;
     private String peasantHouseholdNo;
+    private String regionalCompaniesName;
+    private String developerName;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -912,6 +912,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         QueryWrapper<PeasantHousehold> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("amos_user_id", peasantHouseholdPageDto.getNhUserId());
         queryWrapper.like(StrUtil.isNotEmpty(peasantHouseholdPageDto.getPeasantHouseholdNo()),"peasant_household_no", "%"+peasantHouseholdPageDto.getPeasantHouseholdNo()+"%");
+        queryWrapper.like(StrUtil.isNotEmpty(peasantHouseholdPageDto.getRegionalCompaniesName()),"regional_companies_name", "%"+peasantHouseholdPageDto.getRegionalCompaniesName()+"%");
+        queryWrapper.like(StrUtil.isNotEmpty(peasantHouseholdPageDto.getDeveloperName()),"developer_name", "%"+peasantHouseholdPageDto.getDeveloperName()+"%");
         queryWrapper.orderByDesc("rec_date");
         return this.baseMapper.selectPage(new Page<>(peasantHouseholdPageDto.getCurrent(),peasantHouseholdPageDto.getSize()),queryWrapper);
     }