boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

farm模块-模型查询

Browse Source
This commit is contained in:
顾君禹
2025-08-27 14:10:04 +08:00
parent 6d48e8704b
commit fa70ed39ee
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java
View File

@@ -1,11 +1,13 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; 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 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 org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; 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; 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 = "地区多选用,隔开") @Schema(description = "地区多选用,隔开")
private List<String> suitablePlantingAreas; private List<String> suitablePlantingAreas;
private String areaId;
@Schema(description = "品种描述", example = "随便") @Schema(description = "品种描述", example = "随便")
private String description; private String description;

14
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/modelmanagement/ModelManagementMapper.java
View File

@@ -26,7 +26,7 @@ public interface ModelManagementMapper extends BaseMapperX<ModelManagementDO> {
.likeIfPresent(ModelManagementDO::getSpeciesName, reqVO.getSpeciesName()) .likeIfPresent(ModelManagementDO::getSpeciesName, reqVO.getSpeciesName())
.eqIfPresent(ModelManagementDO::getCycle, reqVO.getCycle()) .eqIfPresent(ModelManagementDO::getCycle, reqVO.getCycle())
.eqIfPresent(ModelManagementDO::getHarvest, reqVO.getHarvest()) .eqIfPresent(ModelManagementDO::getHarvest, reqVO.getHarvest())
.eqIfPresent(ModelManagementDO::getSuitablePlantingAreas, reqVO.getSuitablePlantingAreas()) .likeIfPresent(ModelManagementDO::getSuitablePlantingAreas, reqVO.getAreaId())
.eqIfPresent(ModelManagementDO::getDescription, reqVO.getDescription()) .eqIfPresent(ModelManagementDO::getDescription, reqVO.getDescription())
.betweenIfPresent(ModelManagementDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(ModelManagementDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(ModelManagementDO::getBaseId, reqVO.getBaseId()) .eqIfPresent(ModelManagementDO::getBaseId, reqVO.getBaseId())
@@ -34,17 +34,7 @@ public interface ModelManagementMapper extends BaseMapperX<ModelManagementDO> {
.eqIfPresent(ModelManagementDO::getPlotId, reqVO.getPlotId()) .eqIfPresent(ModelManagementDO::getPlotId, reqVO.getPlotId())
.likeIfPresent(ModelManagementDO::getPlotName, reqVO.getPlotName()) .likeIfPresent(ModelManagementDO::getPlotName, reqVO.getPlotName())
.eqIfPresent(ModelManagementDO::getTenantId, reqVO.getTenantId()) .eqIfPresent(ModelManagementDO::getTenantId, reqVO.getTenantId())
.orderByDesc(ModelManagementDO::getCreateTime) .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);
return selectJoinPage(reqVO, ModelManagementDO.class, query); return selectJoinPage(reqVO, ModelManagementDO.class, query);
} }