From 8ce886d896eaa229b8da0617fc941f65e104faa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Thu, 23 Oct 2025 12:16:14 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 农事记录-结束按钮 --- .../CropFarmingCenterController.java | 20 ++++++- .../vo/FarmingReport1ReqVO.java | 20 +++++++ .../vo/FarmingReport1RespVO.java | 53 +++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1ReqVO.java create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java 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 18ef5f15..1f7c1f4f 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 @@ -31,6 +31,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.module.farm.enums.CommonConstants.FARMING_RECORD_STATUS_2; import static cn.iocoder.yudao.module.farm.enums.CommonConstants.FARMING_RECORD_TASK_STATUS_MAP; /** @@ -60,7 +61,7 @@ public class CropFarmingCenterController { // return success(cropFarmingCenterService.getProductionPlanPage(pageReqVO)); // } - // 生产计划 +// 生产计划 // @GetMapping("/production-plan/page") // @Operation(summary = "生产计划-分页") // public CommonResult> getProductionPlanPage(@Valid ProductionPlanPage2ReqVO pageReqVO) { @@ -249,5 +250,22 @@ public class CropFarmingCenterController { return success(res); } + @Operation(summary = "农事记录-结束按钮") + @GetMapping("/farming-record/finished") + @Parameter(name = "id", description = "农事记录ID") + public CommonResult finishFarmRecord(String id) { + FarmingRecordSaveReqVO updateReqVO = new FarmingRecordSaveReqVO(); + updateReqVO.setId(id); + updateReqVO.setTaskStatus(FARMING_RECORD_STATUS_2); + cropFarmingCenterService.updateFarmingRecord(updateReqVO); + return success(true); + } + + @Operation(summary = "农事报表") + @GetMapping("/farming-report/1") + public CommonResult getFarmReport(FarmingReport1ReqVO req) { + FarmingReport1RespVO res = null; + return success(res); + } } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1ReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1ReqVO.java new file mode 100644 index 00000000..d88da7cf --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1ReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author: binda + * @date: 2025/10/23 11:05 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FarmingReport1ReqVO { + private String baseId; + private String plotId; + private String dataType; + private String[] queryData; +} 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 new file mode 100644 index 00000000..86f91c64 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java @@ -0,0 +1,53 @@ +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +/** + * @description: 报表1 + * @author: binda + * @date: 2025/10/23 10:45 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FarmingReport1RespVO { + private String id; + private String baseId; + private String baseName; + + @Schema(description = "计划编号") + private String planNumber; + + @Schema(description = "排产开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate productionStartDate; + + @Schema(description = "排产结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate productionEndDate; + + @Schema(description = "持续天数") + private Integer intervalDays; + + @Schema(description = "投入品ID", example = "30559") + private String inputId; + private String inputName; + + @Schema(description = "投入品总价") + private Double inputTotalPrice; + + + @Schema(description = "详情-用量") + private Integer usageAmount; + + private Integer currentSpecType; + @Schema(description = "详情-单位") + private Integer unit; + private String unitName; +}