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

feat (farm): 种植中心-农事记录

Browse Source 
- 添加筛选条件 状态
This commit is contained in:
达富斌
2025-10-21 18:41:11 +08:00
parent bf87d88967
commit 5534586250
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordPageReqVO.java
View File

@@ -26,6 +26,9 @@ public class FarmingRecordPageReqVO extends PageParam {
@Schema(description = "任务时间") @Schema(description = "任务时间")
private String taskTime; private String taskTime;
@Schema(description = "任务计划 (0: 未开始; 1: 开始; 2: 结束;)")
private Integer taskStatus;
@Schema(description = "所属地块", example = "10480") @Schema(description = "所属地块", example = "10480")
private String plotId; private String plotId;

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java
View File

@@ -22,6 +22,7 @@ public interface FarmingRecordMapper extends BaseMapperX<FarmingRecordDO> {
.eqIfPresent(FarmingRecordDO::getTaskType, reqVO.getTaskType()) .eqIfPresent(FarmingRecordDO::getTaskType, reqVO.getTaskType())
.likeIfPresent(FarmingRecordDO::getTaskName, reqVO.getTaskName()) .likeIfPresent(FarmingRecordDO::getTaskName, reqVO.getTaskName())
.eqIfPresent(FarmingRecordDO::getTaskScope, reqVO.getTaskScope()) .eqIfPresent(FarmingRecordDO::getTaskScope, reqVO.getTaskScope())
.eqIfPresent(FarmingRecordDO::getTaskStatus, reqVO.getTaskStatus())
.eqIfPresent(FarmingRecordDO::getTaskTime, reqVO.getTaskTime()) .eqIfPresent(FarmingRecordDO::getTaskTime, reqVO.getTaskTime())
.eqIfPresent(FarmingRecordDO::getPlotId, reqVO.getPlotId()) .eqIfPresent(FarmingRecordDO::getPlotId, reqVO.getPlotId())
.eqIfPresent(FarmingRecordDO::getProductionPlanId, reqVO.getProductionPlanId()) .eqIfPresent(FarmingRecordDO::getProductionPlanId, reqVO.getProductionPlanId())

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java
View File

@@ -148,11 +148,11 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
farmingRecord.setTaskName(farmingNameMaintenanceDO.getFarmingName()); farmingRecord.setTaskName(farmingNameMaintenanceDO.getFarmingName());
// 查询并填充投入品列表 // 查询并填充投入品列表
List<FarmingRecordInputDO> inputs = farmingRecordInputMapper.selectList( // List<FarmingRecordInputDO> inputs = farmingRecordInputMapper.selectList(
new LambdaQueryWrapperX<FarmingRecordInputDO>() // new LambdaQueryWrapperX<FarmingRecordInputDO>()
.eq(FarmingRecordInputDO::getFarmRecordId, farmingRecord.getId()) // .eq(FarmingRecordInputDO::getFarmRecordId, farmingRecord.getId())
); // );
farmingRecord.setInvestGoodsList(inputs); // farmingRecord.setInvestGoodsList(inputs);
} }
}); });
} }