diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java index 6565feef..ff719c1c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -30,7 +32,7 @@ public class ModelManagementPageReqVO extends PageParam { @Schema(description = "地区多选用,隔开") private List suitablePlantingAreas; - + private String areaId; @Schema(description = "品种描述", example = "随便") private String description; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java index 2094bb2f..98b1dbe4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java @@ -26,7 +26,7 @@ public interface ModelManagementMapper extends BaseMapperX { .likeIfPresent(ModelManagementDO::getSpeciesName, reqVO.getSpeciesName()) .eqIfPresent(ModelManagementDO::getCycle, reqVO.getCycle()) .eqIfPresent(ModelManagementDO::getHarvest, reqVO.getHarvest()) - .eqIfPresent(ModelManagementDO::getSuitablePlantingAreas, reqVO.getSuitablePlantingAreas()) + .likeIfPresent(ModelManagementDO::getSuitablePlantingAreas, reqVO.getAreaId()) .eqIfPresent(ModelManagementDO::getDescription, reqVO.getDescription()) .betweenIfPresent(ModelManagementDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(ModelManagementDO::getBaseId, reqVO.getBaseId()) @@ -34,17 +34,7 @@ public interface ModelManagementMapper extends BaseMapperX { .eqIfPresent(ModelManagementDO::getPlotId, reqVO.getPlotId()) .likeIfPresent(ModelManagementDO::getPlotName, reqVO.getPlotName()) .eqIfPresent(ModelManagementDO::getTenantId, reqVO.getTenantId()) - .orderByDesc(ModelManagementDO::getCreateTime) - // 连表:物种库 - .leftJoin(SpeciesLibraryDO.class, SpeciesLibraryDO::getId, ModelManagementDO::getSpeciesId) - .selectAs(SpeciesLibraryDO::getCultivarName, ModelManagementDO::getSpeciesName) - // 连表:基地信息 - .leftJoin(BaseInfoDO.class, BaseInfoDO::getId, ModelManagementDO::getBaseId) - .selectAs(BaseInfoDO::getName, ModelManagementDO::getBaseName) - // 连表:地块信息 - .leftJoin(PlotInfoDO.class, PlotInfoDO::getPlotId, ModelManagementDO::getPlotId) - .selectAs(PlotInfoDO::getPlotName, ModelManagementDO::getPlotName); - + .orderByDesc(ModelManagementDO::getCreateTime); return selectJoinPage(reqVO, ModelManagementDO.class, query); }