From 1182b8b80bf3859cd962384ee4f01a43b1ecd139 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 01 九月 2025 16:09:50 +0800 Subject: [PATCH] 设备管理首页新增车间级控制权限 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java index 86ce43d..dc96784 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java @@ -54,11 +54,11 @@ */ @ApiOperation(value = "璁惧绠$悊棣栭〉-鎶�鏈姸鎬佷笌璁惧鎶ヤ慨鏁呴殰鎯呭喌", notes = "璁惧绠$悊棣栭〉-鎶�鏈姸鎬佷笌璁惧鎶ヤ慨鏁呴殰鎯呭喌") @GetMapping(value = "/techornology") - public Result<?> techOrNology() { + public Result<?> techOrNology(String productionCode) { //鎶�鏈姸鎬� - List<EchartsDto> echartsDtoList=iEamEquipmentService.echartsList(); + List<EchartsDto> echartsDtoList=iEamEquipmentService.echartsList(productionCode); //璁惧鎶ヤ慨鏁呴殰鎯呭喌 - List<EchartsDto> echartsDtoList1=iEamReportRepairService.reportRepairList(); + List<EchartsDto> echartsDtoList1=iEamReportRepairService.reportRepairList(productionCode); Map<String,Object> map=new HashMap<>(); map.put("jszt",echartsDtoList); map.put("bxqk",echartsDtoList1); @@ -72,9 +72,9 @@ */ @ApiOperation(value = "璁惧绠$悊棣栭〉-涓夌骇淇濆吇", notes = "璁惧绠$悊棣栭〉-涓夌骇淇濆吇") @GetMapping(value = "/maintenance") - public Result<?> maintenance() { + public Result<?> maintenance(String productionCode) { //涓夌骇淇濆吇 - List<EchartsDto> echartsDtoList = iEamThirdMaintenanceOrderService.selectList(); + List<EchartsDto> echartsDtoList = iEamThirdMaintenanceOrderService.selectList(productionCode); return Result.ok(echartsDtoList); } @@ -84,8 +84,8 @@ */ @ApiOperation(value = "璁惧绠$悊棣栭〉-浜屼繚鍒楄〃", notes = "璁惧绠$悊棣栭〉-浜屼繚鍒楄〃") @GetMapping(value = "/secondmaintenance") - public Result<?> secondmaintenance() { - List<EamFactorySecondMaintPlan> echartsDtoList = iEamFactorySecondMaintPlanService.queryAllList(); + public Result<?> secondmaintenance(String productionCode) { + List<EamFactorySecondMaintPlan> echartsDtoList = iEamFactorySecondMaintPlanService.queryAllList(productionCode); return Result.ok(echartsDtoList); } @@ -100,9 +100,10 @@ @GetMapping(value = "/repairList") public Result<?> repair(@RequestParam(name = "code", required = false) String code, @RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) { + @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize, + String productionCode) { Page<EamReportRepairDto> page = new Page<>(pageNo, pageSize); - IPage<EamReportRepairDto> iPage = iEamReportRepairService.reportRepairList(code,page); + IPage<EamReportRepairDto> iPage = iEamReportRepairService.reportRepairList(code,productionCode,page); return Result.ok(iPage); } @@ -117,9 +118,10 @@ @GetMapping(value = "/maintenanceList") public Result<?> maintenanceList(@RequestParam(name = "code", required = false) String code, @RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) { + @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize, + String productionCode) { Page<EamThirdMaintenanceOrder> page = new Page<>(pageNo, pageSize); - IPage<EamThirdMaintenanceOrder> iPage = iEamThirdMaintenanceOrderService.maintenanceList(code, page); + IPage<EamThirdMaintenanceOrder> iPage = iEamThirdMaintenanceOrderService.maintenanceList(code,productionCode,page); return Result.ok(iPage); } } -- Gitblit v1.9.3