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

fix (farm): 微信端切换租户

Browse Source 
- 添加默认展示字段
This commit is contained in:
达富斌
2025-11-06 20:28:18 +08:00
parent c0c271333a
commit 4aec3151a7
10 changed files with 88 additions and 18 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

@@ -108,7 +108,7 @@ public class ProductionPlanResp2VO {
@Schema(description = "基地负责人")
private String baseManager;
@Schema(description = "地块使用剩余网箱数")
@Schema(description = "地块使用网箱数")
private Integer predictedGridNumber;
@Schema(description = "养殖网箱信息")
private ProductionPlanGridRespVO planGridInfo;

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

@@ -88,6 +88,10 @@ public class ProductionPlanRespVO {
private Double remainingArea;
@Schema(description = "占地面积(百分比)")
private Double usagePercentage;
@Schema(description = "地块总网箱数")
private Integer plotGridNumber;
@Schema(description = "地块使用剩余网箱数")
private Integer predictedGridNumber;
@Schema(description = "备注")
private String remark;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java
View File

@@ -95,8 +95,8 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
PersonnelManagementDO updateObj = BeanUtils.toBean(updateReqVO, PersonnelManagementDO.class);
SystemUserDO userDO = userMapper.selectByPhone(managementDO.getPhone());
if (updateReqVO.getPhone() != null) userDO.setUsername(updateReqVO.getPhone());
if (updateReqVO.getName() != null) userDO.setNickname(updateReqVO.getName());
if (updateReqVO.getPhone() != null) userDO.setMobile(updateReqVO.getPhone());
if (updateReqVO.getName() != null) userDO.setNickname(updateReqVO.getName());
if (updateReqVO.getPicture() != null) userDO.setAvatar(updateReqVO.getPicture());
// 处理图片集合转换
handleImageConversion(updateObj, updateReqVO);