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

fix (farm): 基地管理,生产计划

Browse Source 
- 编辑基地
- 计划ID
This commit is contained in:
达富斌
2025-08-31 13:42:16 +08:00
parent 11036a32d7
commit 7bbc4cc616
3 changed files with 7 additions and 1 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/vo/ProductionPlanResp2VO.java
View File

@@ -32,6 +32,8 @@ public class ProductionPlanResp2VO {
private String text; private String text;
@Schema(description = "地块数量") @Schema(description = "地块数量")
private int size; private int size;
@Schema(description = "计划ID")
private String planId;
@Schema(description = "计划编号") @Schema(description = "计划编号")
private String planNumber; private String planNumber;
@Schema(description = "种植物种-编码") @Schema(description = "种植物种-编码")

5
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java
View File

@@ -77,11 +77,14 @@ public class BaseInfoServiceImpl implements BaseInfoService {
BaseInfoDO sourceBaseInfoDO = baseInfoMapper.selectById(baseId); BaseInfoDO sourceBaseInfoDO = baseInfoMapper.selectById(baseId);
BigDecimal oldArea = sourceBaseInfoDO.getArea(); BigDecimal oldArea = sourceBaseInfoDO.getArea();
BigDecimal newArea = updateReqVO.getArea(); BigDecimal newArea = updateReqVO.getArea();
if (oldArea.compareTo(newArea) == 0) {
return ;
}
// 更新 // 更新
BaseInfoDO updateObj = BeanUtils.toBean(updateReqVO, BaseInfoDO.class); BaseInfoDO updateObj = BeanUtils.toBean(updateReqVO, BaseInfoDO.class);
baseInfoMapper.updateById(updateObj); baseInfoMapper.updateById(updateObj);
// 同步 // 同步
productionPlanService.syncBaseAreaToAllPlansByBaseId(baseId, newArea, oldArea); // productionPlanService.syncBaseAreaToAllPlansByBaseId(baseId, newArea, oldArea);
} }
@Override @Override

1
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java
View File

@@ -318,6 +318,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService {
subNode.setText(speciesNameMap.get(subPlan.getPlantSpeciesCode())); subNode.setText(speciesNameMap.get(subPlan.getPlantSpeciesCode()));
subNode.setPlantSpeciesCode(subPlan.getPlantSpeciesCode()); subNode.setPlantSpeciesCode(subPlan.getPlantSpeciesCode());
subNode.setPlantSpeciesName(speciesNameMap.get(subPlan.getPlantSpeciesCode())); subNode.setPlantSpeciesName(speciesNameMap.get(subPlan.getPlantSpeciesCode()));
subNode.setPlanId(subPlan.getId());
subNode.setPlanNumber(subPlan.getPlanNumber()); subNode.setPlanNumber(subPlan.getPlanNumber());
subNode.setPlanStatus(subPlan.getPlanStatus()); subNode.setPlanStatus(subPlan.getPlanStatus());
subNode.setPlanStatusName(PLAN_MAP.getOrDefault(subPlan.getPlanStatus(),"")); subNode.setPlanStatusName(PLAN_MAP.getOrDefault(subPlan.getPlanStatus(),""));