From 5534586250be4c77cb329d0bcbde1a66a29cda6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Tue, 21 Oct 2025 18:41:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=20(farm):=20=E7=A7=8D=E6=A4=8D=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E5=86=9C=E4=BA=8B=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加筛选条件 状态 --- .../cropfarmingcenter/vo/FarmingRecordPageReqVO.java | 3 +++ .../dal/mysql/farmingrecord/FarmingRecordMapper.java | 1 + .../farmingrecord/FarmingRecordServiceImpl.java | 10 +++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java index 1c7939d5..fbaaf6eb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java @@ -26,6 +26,9 @@ public class FarmingRecordPageReqVO extends PageParam { @Schema(description = "任务时间") private String taskTime; + @Schema(description = "任务计划 (0: 未开始; 1: 开始; 2: 结束;)") + private Integer taskStatus; + @Schema(description = "所属地块", example = "10480") private String plotId; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java index 505fd8fa..1189db98 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java @@ -22,6 +22,7 @@ public interface FarmingRecordMapper extends BaseMapperX { .eqIfPresent(FarmingRecordDO::getTaskType, reqVO.getTaskType()) .likeIfPresent(FarmingRecordDO::getTaskName, reqVO.getTaskName()) .eqIfPresent(FarmingRecordDO::getTaskScope, reqVO.getTaskScope()) + .eqIfPresent(FarmingRecordDO::getTaskStatus, reqVO.getTaskStatus()) .eqIfPresent(FarmingRecordDO::getTaskTime, reqVO.getTaskTime()) .eqIfPresent(FarmingRecordDO::getPlotId, reqVO.getPlotId()) .eqIfPresent(FarmingRecordDO::getProductionPlanId, reqVO.getProductionPlanId()) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java index 660d9a04..841ef919 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java @@ -148,11 +148,11 @@ public class FarmingRecordServiceImpl implements FarmingRecordService { farmingRecord.setTaskName(farmingNameMaintenanceDO.getFarmingName()); // 查询并填充投入品列表 - List inputs = farmingRecordInputMapper.selectList( - new LambdaQueryWrapperX() - .eq(FarmingRecordInputDO::getFarmRecordId, farmingRecord.getId()) - ); - farmingRecord.setInvestGoodsList(inputs); +// List inputs = farmingRecordInputMapper.selectList( +// new LambdaQueryWrapperX() +// .eq(FarmingRecordInputDO::getFarmRecordId, farmingRecord.getId()) +// ); +// farmingRecord.setInvestGoodsList(inputs); } }); }