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 749b0c87..a8565e6e 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 @@ -255,7 +255,7 @@ public class CropFarmingCenterController { } @Operation(summary = "农事记录-结束按钮") - @GetMapping("/farming-record/finished") + @PutMapping("/farming-record/finished") @Parameter(name = "id", description = "农事记录ID") public CommonResult finishFarmRecord(String id) { FarmingRecordSaveReqVO updateReqVO = new FarmingRecordSaveReqVO(); 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 8dc2f624..8a351b34 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 @@ -41,7 +41,7 @@ public interface FarmingRecordMapper extends BaseMapperX { .likeIfPresent(FarmingRecordDO::getPlotName, reqVO.getPlotName()) .eqIfPresent(FarmingRecordDO::getTenantId, reqVO.getTenantId()) .betweenIfPresent(FarmingRecordDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(FarmingRecordDO::getTaskTime)); + .orderByDesc(FarmingRecordDO::getTaskEndDate)); } FarmingDistributionRespVO getFarmingDistributionChart(FarmingDistributionReqVO req); 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 16c32289..f88dbce9 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 @@ -75,13 +75,13 @@ public class FarmingRecordServiceImpl implements FarmingRecordService { // 处理图片集合转换 handleImageConversion(farmingRecord, createReqVO); //投入品集合单条保存 - if (ObjectUtils.isNotEmpty(createReqVO.getInvestGoodsList())) { - createReqVO.getInvestGoodsList().forEach(e -> { - e.setId(IdUtil.fastUUID()); - e.setFarmRecordId(farmingRecord.getId()); - farmingRecordInputMapper.insert(e); - }); - } +// if (ObjectUtils.isNotEmpty(createReqVO.getInvestGoodsList())) { +// createReqVO.getInvestGoodsList().forEach(e -> { +// e.setId(IdUtil.fastUUID()); +// e.setFarmRecordId(farmingRecord.getId()); +// farmingRecordInputMapper.insert(e); +// }); +// } farmingRecordMapper.insert(farmingRecord); // 返回 @@ -218,7 +218,7 @@ public class FarmingRecordServiceImpl implements FarmingRecordService { saveReqVO.setTaskType(createReqVO.getTaskType()); saveReqVO.setTaskName(createReqVO.getTaskName()); saveReqVO.setTaskScope(createReqVO.getTaskScope()); - saveReqVO.setTaskTime(taskTime); + saveReqVO.setTaskTime(createReqVO.getTaskTime()); saveReqVO.setTaskStartDate(taskStartDate); saveReqVO.setTaskEndDate(taskEndDate); saveReqVO.setPlotId(createReqVO.getPlotId());