From ab2e606966c2839c2d851ebd9b5606141774d40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Wed, 27 Aug 2025 22:58:43 +0800 Subject: [PATCH] =?UTF-8?q?feat=20(farm):=20=E5=9F=BA=E5=9C=B0=E8=A7=84?= =?UTF-8?q?=E5=88=92-=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 网格-行, 网格-列 字段更名 --- .../farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java | 4 ++-- .../module/farm/service/baseinfo/BaseInfoServiceImpl.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java index a8d83cd5..fb54055c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java @@ -99,9 +99,9 @@ public class BaseInfoRespVO { @Schema(description = "网格类型-名称") private String typeName; @Schema(description = "网格-行") - private Integer row; + private Integer gridRow; @Schema(description = "网格-列") - private Integer column; + private Integer gridColumn; @Schema(description = "网格-颜色") private String color; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java index d84d06e5..99f37c16 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java @@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.PersonnelManag import cn.iocoder.yudao.module.farm.dal.mysql.plotinfo.PlotInfoMapper; import cn.iocoder.yudao.module.farm.dal.mysql.productionplan.ProductionPlanMapper; import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper; +import cn.iocoder.yudao.module.farm.enums.CommonConstants; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; @@ -221,6 +222,10 @@ public class BaseInfoServiceImpl implements BaseInfoService { if (ObjectUtils.isEmpty(gridList)) { return Collections.EMPTY_LIST; } - return BeanUtils.toBean(gridList, BaseInfoRespVO.GridInfo.class); + List gridInfos = BeanUtils.toBean(gridList, BaseInfoRespVO.GridInfo.class); + for (BaseInfoRespVO.GridInfo info : gridInfos) { + info.setTypeName(CommonConstants.GRID_TYPE.get(info.getType())); + } + return gridInfos; } } \ No newline at end of file