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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
顾君禹
2025-08-28 09:28:45 +08:00
parent fed3313e28 ab2e606966
commit e9f25719bd
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java
View File

@@ -99,9 +99,9 @@ public class BaseInfoRespVO {
@Schema(description = "网格类型-名称") @Schema(description = "网格类型-名称")
private String typeName; private String typeName;
@Schema(description = "网格-行") @Schema(description = "网格-行")
private Integer row; private Integer gridRow;
@Schema(description = "网格-列") @Schema(description = "网格-列")
private Integer column; private Integer gridColumn;
@Schema(description = "网格-颜色") @Schema(description = "网格-颜色")
private String color; private String color;
} }

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

@@ -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.plotinfo.PlotInfoMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.productionplan.ProductionPlanMapper; 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.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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@@ -221,6 +222,10 @@ public class BaseInfoServiceImpl implements BaseInfoService {
if (ObjectUtils.isEmpty(gridList)) { if (ObjectUtils.isEmpty(gridList)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
return BeanUtils.toBean(gridList, BaseInfoRespVO.GridInfo.class); List<BaseInfoRespVO.GridInfo> gridInfos = BeanUtils.toBean(gridList, BaseInfoRespVO.GridInfo.class);
for (BaseInfoRespVO.GridInfo info : gridInfos) {
info.setTypeName(CommonConstants.GRID_TYPE.get(info.getType()));
}
return gridInfos;
} }
} }