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

fix (farm):

Browse Source 
- 农事记录-修改bug
- 农事记录-结束按钮
This commit is contained in:
达富斌
2025-10-30 00:10:52 +08:00
parent 9be971b68a
commit 079c0afe59
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java
View File

@@ -255,7 +255,7 @@ public class CropFarmingCenterController {
} }
@Operation(summary = "农事记录-结束按钮") @Operation(summary = "农事记录-结束按钮")
@GetMapping("/farming-record/finished") @PutMapping("/farming-record/finished")
@Parameter(name = "id", description = "农事记录ID") @Parameter(name = "id", description = "农事记录ID")
public CommonResult<Boolean> finishFarmRecord(String id) { public CommonResult<Boolean> finishFarmRecord(String id) {
FarmingRecordSaveReqVO updateReqVO = new FarmingRecordSaveReqVO(); FarmingRecordSaveReqVO updateReqVO = new FarmingRecordSaveReqVO();

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

@@ -41,7 +41,7 @@ public interface FarmingRecordMapper extends BaseMapperX<FarmingRecordDO> {
.likeIfPresent(FarmingRecordDO::getPlotName, reqVO.getPlotName()) .likeIfPresent(FarmingRecordDO::getPlotName, reqVO.getPlotName())
.eqIfPresent(FarmingRecordDO::getTenantId, reqVO.getTenantId()) .eqIfPresent(FarmingRecordDO::getTenantId, reqVO.getTenantId())
.betweenIfPresent(FarmingRecordDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(FarmingRecordDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(FarmingRecordDO::getTaskTime)); .orderByDesc(FarmingRecordDO::getTaskEndDate));
} }
FarmingDistributionRespVO getFarmingDistributionChart(FarmingDistributionReqVO req); FarmingDistributionRespVO getFarmingDistributionChart(FarmingDistributionReqVO req);

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

@@ -75,13 +75,13 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
// 处理图片集合转换 // 处理图片集合转换
handleImageConversion(farmingRecord, createReqVO); handleImageConversion(farmingRecord, createReqVO);
//投入品集合单条保存 //投入品集合单条保存
if (ObjectUtils.isNotEmpty(createReqVO.getInvestGoodsList())) { // if (ObjectUtils.isNotEmpty(createReqVO.getInvestGoodsList())) {
createReqVO.getInvestGoodsList().forEach(e -> { // createReqVO.getInvestGoodsList().forEach(e -> {
e.setId(IdUtil.fastUUID()); // e.setId(IdUtil.fastUUID());
e.setFarmRecordId(farmingRecord.getId()); // e.setFarmRecordId(farmingRecord.getId());
farmingRecordInputMapper.insert(e); // farmingRecordInputMapper.insert(e);
}); // });
} // }
farmingRecordMapper.insert(farmingRecord); farmingRecordMapper.insert(farmingRecord);
// 返回 // 返回
@@ -218,7 +218,7 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
saveReqVO.setTaskType(createReqVO.getTaskType()); saveReqVO.setTaskType(createReqVO.getTaskType());
saveReqVO.setTaskName(createReqVO.getTaskName()); saveReqVO.setTaskName(createReqVO.getTaskName());
saveReqVO.setTaskScope(createReqVO.getTaskScope()); saveReqVO.setTaskScope(createReqVO.getTaskScope());
saveReqVO.setTaskTime(taskTime); saveReqVO.setTaskTime(createReqVO.getTaskTime());
saveReqVO.setTaskStartDate(taskStartDate); saveReqVO.setTaskStartDate(taskStartDate);
saveReqVO.setTaskEndDate(taskEndDate); saveReqVO.setTaskEndDate(taskEndDate);
saveReqVO.setPlotId(createReqVO.getPlotId()); saveReqVO.setPlotId(createReqVO.getPlotId());