diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/HomeController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/HomeController.java index 2d99427d..da63beed 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/HomeController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/HomeController.java @@ -42,6 +42,13 @@ public class HomeController { return success(homeService.getHomeInfo(baseId)); } + @Operation(summary = "农场首页-地块详情") + @GetMapping("/plot/get") + @Parameter(name = "plotId", description = "地块ID") + public CommonResult getPlotInfo(@RequestParam("plotId") String plotId) { + return success(homeService.getPlotInfo(plotId)); + } + @Operation(summary = "农场首页-基地名称列表") @GetMapping("/baseNames") public CommonResult> getBaseNameList() { @@ -63,7 +70,7 @@ public class HomeController { @Parameter(name = "tenantId", description = "租户ID") public CommonResult scanQrCodes(@RequestParam("baseId") String baseId, @RequestParam("tenantId") String tenantId) { - QrDetailsRespVO res = homeService.scanQrCodes(baseId,tenantId); + QrDetailsRespVO res = homeService.scanQrCodes(baseId, tenantId); return success(res); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeService.java index 6d492f40..4a8088e7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeService.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.farm.service.home; import cn.iocoder.yudao.module.farm.controller.admin.home.vo.BaseNameVO; import cn.iocoder.yudao.module.farm.controller.admin.home.vo.HomeInfo; -import cn.iocoder.yudao.module.farm.controller.admin.home.vo.OutlinedInfoVO; import cn.iocoder.yudao.module.farm.controller.admin.home.vo.QrDetailsRespVO; import java.util.List; @@ -23,6 +22,8 @@ public interface HomeService { */ HomeInfo getHomeInfo(String baseId); + HomeInfo.PlotInfo getPlotInfo(String plotId); + List getBaseNameList(); /** diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java index 2abe8add..9a5f4cc1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java @@ -150,6 +150,41 @@ public class HomeServiceImpl implements HomeService { return targetList; } + @Override + public PlotInfo getPlotInfo(String plotId) { + // 员工集合 + Map employeeNameMap = personnelManagementService.getEmployeeNameMap(); + + PlotInfoDO pObj = plotInfoService.getPlotInfo(plotId); + BaseInfoDO bOjb = baseInfoService.getBaseInfo(pObj.getBaseId()); + + return this.getPlotInfo(pObj,bOjb,employeeNameMap); + } + + private PlotInfo getPlotInfo(PlotInfoDO e, BaseInfoDO baseObj, Map employeeNameMap) { + String employeeName = personnelManagementService.getEmployeeNameMap(employeeNameMap, e.getEmployeeId()); + // 地块详情 (包含计划信息) + PlotOrCropInfo plotOrCropInfo = this.getPlotOrCropInfoList(e,"地块详情",employeeName); + // 地块浮框信息 + List plotPopupFrame = this.getPlotPopupFrame(e.getId(), employeeNameMap); + // 户主流转信息 + List lesseeList = plotInfoService.getPlotLesseeList(e.getId()); + + PlotInfo t = new PlotInfo(); + t.setBaseId(e.getBaseId()); + t.setBaseName(baseObj.getName()); + t.setPlotId(e.getPlotId()); + t.setPlotName(e.getPlotName()); + t.setPlotArea(BigDecimalUtil.roundedViaMath(e.getPlotArea())); + t.setManager(employeeName); + t.setPoint(e.getPoint()); + t.setPlotColor(e.getPlotColor()); + t.setPlotOrCropInfo(plotOrCropInfo); + t.setPlotPopupFrames(plotPopupFrame); + t.setLesseeList(lesseeList); + return t; + } + private List getPlotInfoList(BaseInfoDO baseObj,Map employeeNameMap) { List targetList = new ArrayList<>(); List plotList = plotInfoService.getPlotInfos(baseObj.getId()); @@ -171,9 +206,9 @@ public class HomeServiceImpl implements HomeService { t.setManager(employeeName); t.setPoint(e.getPoint()); t.setPlotColor(e.getPlotColor()); - t.setPlotOrCropInfo(plotOrCropInfo); +// t.setPlotOrCropInfo(plotOrCropInfo); t.setPlotPopupFrames(plotPopupFrame); - t.setLesseeList(lesseeList); +// t.setLesseeList(lesseeList); targetList.add(t); } return targetList;