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); } }); }