From b083d467c1059f65193d1605fbf0e88a0e942992 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 19:06:02 +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 - 添加筛选条件 状态 --- .../CropFarmingCenterController.java | 7 +++- .../vo/FarmingRecordRespVO.java | 2 + .../module/farm/enums/CommonConstants.java | 9 +++- .../CropFarmingCenterServiceImpl.java | 42 ++++++++++--------- 4 files changed, 38 insertions(+), 22 deletions(-) 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 1fc1daca..0bde804c 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_TASK_STATUS_MAP; /** * @description: 生产中心 @@ -206,7 +207,11 @@ public class CropFarmingCenterController { @Operation(summary = "农事记录-分页") public CommonResult> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) { PageResult pageResult = cropFarmingCenterService.getFarmingRecordPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class)); + PageResult target = BeanUtils.toBean(pageResult, FarmingRecordRespVO.class); + for (FarmingRecordRespVO f : target.getList()) { + f.setTaskStatusName(FARMING_RECORD_TASK_STATUS_MAP.get(f.getTaskStatus())); + } + return success(target); } @GetMapping("/farming-record/get/{id}") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java index 888822f4..9b6926f2 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingRecordRespVO.java @@ -29,6 +29,8 @@ public class FarmingRecordRespVO { @Schema(description = "任务范围") @ExcelProperty("任务范围") private String taskScope; + private Integer taskStatus; + private String taskStatusName; @Schema(description = "任务时间") @ExcelProperty("任务时间") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java index b6b281c5..32dbf4d9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java @@ -70,7 +70,8 @@ public class CommonConstants { public final static String GROW_FLAG_1 = "在种"; public final static String GROW_FLAG_2 = "空闲"; - public final static Integer FARMING_RECORD_STATUS_1 = 1;//开始 + public final static Integer FARMING_RECORD_STATUS_0 = 0; //未开始 + public final static Integer FARMING_RECORD_STATUS_1 = 1; //开始 public final static Integer FARMING_RECORD_STATUS_2 = 2; // "结束"; public final static Integer FARM_MODEL_FARMING_OPERATION_USABLE_TYPE_1 = 1; // 可用 @@ -102,8 +103,14 @@ public class CommonConstants { public static Map SYNC_FLAG_MAP = new HashMap<>(); public static Map USAGE_STATUS_MAP = new HashMap<>(); public static Map INPUT_CATEGORY_MAP = new HashMap<>(); + public static Map FARMING_RECORD_TASK_STATUS_MAP = new HashMap<>(); static { + + FARMING_RECORD_TASK_STATUS_MAP.put(FARMING_RECORD_STATUS_0, "未开始"); + FARMING_RECORD_TASK_STATUS_MAP.put(FARMING_RECORD_STATUS_1, "开始"); + FARMING_RECORD_TASK_STATUS_MAP.put(FARMING_RECORD_STATUS_2, "结束"); + INPUT_CATEGORY_MAP.put(INPUT_CATEGORY_1,"模版类型"); INPUT_CATEGORY_MAP.put(INPUT_CATEGORY_2,"引用类型"); 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 08ffc1cf..134298ea 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 @@ -588,29 +588,31 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { @Override public FarmingRecordRespVO getFarmingRecord(String id) { + FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id); - - List list = new ArrayList<>(); - for (FarmingRecordInputDO fr : farmingRecord.getInvestGoodsList()) { - FarmingRecordRespVO.FarmingRecordInputVO target = new FarmingRecordRespVO.FarmingRecordInputVO(); - target.setId(fr.getId()); - target.setInputsId(fr.getInputChildCategory()); - target.setAssetType(fr.getInputParentCategory()); - target.setDose(fr.getDosage()); - target.setUsage(fr.getUsage()); - - int diluted = fr.getDilutionRatio() != null ? Integer.parseInt(fr.getDilutionRatio()) : 0; - target.setDiluted(diluted); - int packageUnit = fr.getSingleUseUnit() != null ? Integer.parseInt(fr.getSingleUseUnit()) : 0; - target.setPackageUnit(packageUnit); - int unit = fr.getSingleUseOption() != null ? Integer.parseInt(fr.getSingleUseOption()) : 0; - target.setUnit(unit); - list.add(target); - } - FarmingRecordRespVO res = BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class); - res.setInvestGoodsList(list); + res.setTaskStatusName(FARMING_RECORD_TASK_STATUS_MAP.get(res.getTaskStatus())); + +// List list = new ArrayList<>(); +// for (FarmingRecordInputDO fr : farmingRecord.getInvestGoodsList()) { +// FarmingRecordRespVO.FarmingRecordInputVO target = new FarmingRecordRespVO.FarmingRecordInputVO(); +// target.setId(fr.getId()); +// target.setInputsId(fr.getInputChildCategory()); +// target.setAssetType(fr.getInputParentCategory()); +// target.setDose(fr.getDosage()); +// target.setUsage(fr.getUsage()); +// +// int diluted = fr.getDilutionRatio() != null ? Integer.parseInt(fr.getDilutionRatio()) : 0; +// target.setDiluted(diluted); +// int packageUnit = fr.getSingleUseUnit() != null ? Integer.parseInt(fr.getSingleUseUnit()) : 0; +// target.setPackageUnit(packageUnit); +// int unit = fr.getSingleUseOption() != null ? Integer.parseInt(fr.getSingleUseOption()) : 0; +// target.setUnit(unit); +// list.add(target); +// } +// res.setInvestGoodsList(list); return res; + } @Override