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

farm模块-地块返回基地名称

Browse Source
This commit is contained in:
顾君禹
2025-08-31 18:52:09 +08:00
parent ebcf26b666
commit 553972bf36
2 changed files with 11 additions and 5 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/dal/dataobject/plotinfo/PlotInfoDO.java
View File

@@ -32,6 +32,8 @@ public class PlotInfoDO extends BaseDO {
* 所属基地ID * 所属基地ID
*/ */
private String baseId; private String baseId;
@TableField(exist = false)
private String baseName;
/** /**
* 地块ID * 地块ID
*/ */

14
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/plotinfo/PlotInfoServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class PlotInfoServiceImpl implements PlotInfoService {
throw exception(PLOT_INFO_NOT_EXISTS); throw exception(PLOT_INFO_NOT_EXISTS);
} }
// 校验: 存在在种地块时 不允许删除 // 校验: 存在在种地块时 不允许删除
boolean flag = productionPlanService.validateIncompletePlansBId("plot_id",obj.getPlotId()); boolean flag = productionPlanService.validateIncompletePlansBId("plot_id", obj.getPlotId());
// 删除 // 删除
if (flag) { if (flag) {
plotInfoMapper.deleteById(id); plotInfoMapper.deleteById(id);
@@ -106,12 +106,15 @@ public class PlotInfoServiceImpl implements PlotInfoService {
@Override @Override
public PlotInfoDO getPlotInfo(String id) { public PlotInfoDO getPlotInfo(String id) {
return plotInfoMapper.selectById(id); PlotInfoDO plotInfoDO = plotInfoMapper.selectById(id);
BaseInfoDO baseInfoDO = baseInfoMapper.selectById(plotInfoDO.getBaseId());
plotInfoDO.setBaseName(baseInfoDO.getName());
return plotInfoDO;
} }
@Override @Override
public List<PlotInfoDO> getPlotInfos(String baseId) { public List<PlotInfoDO> getPlotInfos(String baseId) {
return plotInfoMapper.selectList("base_id",baseId); return plotInfoMapper.selectList("base_id", baseId);
} }
@Override @Override
@@ -138,9 +141,10 @@ public class PlotInfoServiceImpl implements PlotInfoService {
/** /**
* 验证: 地块总面积不得大于基地面积 * 验证: 地块总面积不得大于基地面积
*
* @param baseId 基地面积 * @param baseId 基地面积
*/ */
private boolean validateTotalPlotArea(String baseId){ private boolean validateTotalPlotArea(String baseId) {
BaseInfoDO baseObj = baseInfoMapper.selectOne("id", baseId); BaseInfoDO baseObj = baseInfoMapper.selectOne("id", baseId);
BigDecimal baseArea = baseObj.getArea(); BigDecimal baseArea = baseObj.getArea();
@@ -154,7 +158,7 @@ public class PlotInfoServiceImpl implements PlotInfoService {
.filter(area -> area != null) // 重要：过滤null值 .filter(area -> area != null) // 重要：过滤null值
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
return plotTotalArea.compareTo(baseArea) > 0 ; return plotTotalArea.compareTo(baseArea) > 0;
} }
} }