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-09-01 15:58:31 +08:00
parent b0d86151b6
commit e1b50dcfac
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java
View File

@@ -29,6 +29,9 @@ public class HomeInfo {
@Schema(description = "统计信息") @Schema(description = "统计信息")
private StatisticalInfo statisticalInfo; private StatisticalInfo statisticalInfo;
public HomeInfo(BaseOverviewInfo baseOverviewInfo) {
this.baseOverviewInfo = baseOverviewInfo;
}
@Data @Data
@AllArgsConstructor @AllArgsConstructor

11
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java
View File

@@ -16,6 +16,7 @@ import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagem
import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService; import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService;
import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@@ -55,6 +56,12 @@ public class HomeServiceImpl implements HomeService {
@Override @Override
public HomeInfo getHomeInfo(String baseId) { public HomeInfo getHomeInfo(String baseId) {
if (StringUtils.isEmpty(baseId)) {
BaseOverviewInfo baseOverviewInfo = new BaseOverviewInfo();
return new HomeInfo(baseOverviewInfo);
}
// 员工集合 <id,name> // 员工集合 <id,name>
Map<String, String> employeeNameMap = personnelManagementService.getEmployeeNameMap(); Map<String, String> employeeNameMap = personnelManagementService.getEmployeeNameMap();
BaseInfoDO baseObj = baseInfoService.getBaseInfo(baseId); BaseInfoDO baseObj = baseInfoService.getBaseInfo(baseId);
@@ -96,8 +103,8 @@ public class HomeServiceImpl implements HomeService {
List<PlotInfoDO> plotList = plotInfoService.getPlotInfos(baseObj.getId()); List<PlotInfoDO> plotList = plotInfoService.getPlotInfos(baseObj.getId());
for (PlotInfoDO e : plotList) { for (PlotInfoDO e : plotList) {
String employeeName = personnelManagementService.getEmployeeNameMap(employeeNameMap, e.getEmployeeId()); String employeeName = personnelManagementService.getEmployeeNameMap(employeeNameMap, e.getEmployeeId());
String beingPlotArea = productionPlanService.getBeingPlotArea(e.getId(), e.getPlotArea()); String beingPlotArea = productionPlanService.getBeingPlotArea(e.getPlotId(), e.getPlotArea());
String beingCropName = productionPlanService.getBeingCropName(e.getId()); String beingCropName = productionPlanService.getBeingCropName(e.getPlotId());
targetList.add(new PlotPopupFrame(beingPlotArea,employeeName,beingCropName)); targetList.add(new PlotPopupFrame(beingPlotArea,employeeName,beingCropName));
} }