diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java index 4ed5aa73..749b0c87 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java @@ -267,7 +267,7 @@ public class CropFarmingCenterController { @Operation(summary = "农事报表") @GetMapping("/farming-report/1") - public CommonResult> getFarmReport(FarmingReport1ReqVO req) { + public CommonResult> getFarmReport(ChartCommonReqVO req) { List res = cropFarmingCenterService.getFarmReport(req); return success(res); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java index b2900e13..55416d18 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java @@ -35,7 +35,7 @@ public class FarmingReport1RespVO { @Schema(description = "持续天数") private Integer intervalDays; - @Schema(description = "投入品ID", example = "30559") + @Schema(description = "投入品ID") private String inputId; private String inputName; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/usagerecords/InputUsageRecordsSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/usagerecords/InputUsageRecordsSaveReqVO.java index e243b996..54533b92 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/usagerecords/InputUsageRecordsSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/usagerecords/InputUsageRecordsSaveReqVO.java @@ -38,4 +38,7 @@ public class InputUsageRecordsSaveReqVO { @Schema(description = "备注", example = "随便") private String remark; + private String baseId; + private String plotId; + } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java index 6559c429..4fb0dca3 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; import com.baomidou.mybatisplus.annotation.*; import lombok.*; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -46,6 +47,8 @@ public class FarmingRecordDO extends BaseDO { * 任务时间 */ private String taskTime; + private LocalDate taskStartDate; + private LocalDate taskEndDate; /** * 任务计划 (0: 未开始; 1: 开始; 2: 结束;) */ diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java index ea3a6bda..2a1587bf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java @@ -4,6 +4,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingReport1RespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.InputUsageChartRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.usagerecords.InputUsageRecordsPageReqVO; @@ -33,4 +34,6 @@ public interface InputUsageRecordsMapper extends BaseMapperX getInputUsageChart(ChartCommonReqVO req); + + List getFarmReport(ChartCommonReqVO req); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java index b368f20b..4a049897 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java @@ -74,7 +74,7 @@ public interface CropFarmingCenterService { List getFcReport(FarmingRecordReportReqVO req); - List getFarmReport(FarmingReport1ReqVO req); + List getFarmReport(ChartCommonReqVO req); List getFarmTypeChart(ChartCommonReqVO req); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java index 62dbe572..648d5e45 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java @@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanag import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputUsageRecordsDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; @@ -712,15 +713,8 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { } @Override - public List getFarmReport(FarmingReport1ReqVO req) { - List res = new ArrayList<>(); - - List farmingRecordDOS = farmingRecordMapper.selectList(); - for (FarmingRecordDO f : farmingRecordDOS) { - - } - - return res; + public List getFarmReport(ChartCommonReqVO req) { + return inputUsageRecordsMapper.getFarmReport(req); } @Override @@ -735,7 +729,6 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { @Override public List getInputUsageChart(ChartCommonReqVO req) { - return inputUsageRecordsMapper.getInputUsageChart(req); } diff --git a/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml b/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml index c21ae0e5..fc2deb95 100644 --- a/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml @@ -44,4 +44,49 @@ ORDER BY usageAmount DESC + + + \ No newline at end of file