From c2a91cd37f7dc6a6be5e574eb497da1252545b3c Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 22 Jan 2026 15:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/ComplexQueryController.java | 6 +++--- .../controller/RepairAuditDetailsController.java | 6 +++--- .../repair/controller/RepairController.java | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index 97ce3a29..c060f360 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -217,9 +217,9 @@ public class ComplexQueryController extends BaseController { @ApiOperation(value = "综合查询--查询新购待入库设备详情") @GetMapping("/getPurchaseRecordList") public AjaxResult getPurchaseRecordList(PurchaseInputInfo bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(deptId); + startPage(); List list = complexQueryService.getPurchaseRecordList(bean); return AjaxResult.success(getDataTable(list)); } @@ -247,9 +247,9 @@ public class ComplexQueryController extends BaseController { @ApiOperation(value = "综合查询--查询修饰待入库设备详情") @GetMapping("/getRepairInputList") public AjaxResult getRepairInputList(RepairInputRecord bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(deptId); + startPage(); List list = complexQueryService.getRepairInputList(bean); return AjaxResult.success(getDataTable(list)); } @@ -500,9 +500,9 @@ public class ComplexQueryController extends BaseController { @ApiOperation(value = "综合查询--机具库存个人查询") @GetMapping("/getPersonNum") public AjaxResult getPersonNum(RetainedEquipmentInfo bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(Math.toIntExact(deptId)); + startPage(); List pageList = complexQueryService.getPersonNum(bean); return AjaxResult.success(getDataTable(pageList)); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index 5d5d23f9..65b1f9f5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -143,9 +143,9 @@ public class RepairAuditDetailsController extends BaseController { @ApiOperation("查看维修记录") @GetMapping("/getRepairRecord") public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) { - startPage(); Long deptId = typeService.getUserDeptId(); repairAuditDetails.setCompanyId(Math.toIntExact(deptId)); + startPage(); List list = repairAuditDetailsService.getRepairRecord(repairAuditDetails); return getDataTable(list); } @@ -156,9 +156,9 @@ public class RepairAuditDetailsController extends BaseController { @ApiOperation("查看配件记录") @GetMapping("/getPartRecord") public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) { - startPage(); Long deptId = typeService.getUserDeptId(); repairAuditDetails.setCompanyId(Math.toIntExact(deptId)); + startPage(); List list = repairAuditDetailsService.getPartRecord(repairAuditDetails); return getDataTable(list); } @@ -186,9 +186,9 @@ public class RepairAuditDetailsController extends BaseController { @RequiresPermissions("repair:details:list") @GetMapping("/list") public TableDataInfo list(RepairAuditDetails repairAuditDetails) { - startPage(); Long deptId = typeService.getUserDeptId(); repairAuditDetails.setCompanyId(Math.toIntExact(deptId)); + startPage(); List list = repairAuditDetailsService.selectRepairAuditDetailsList(repairAuditDetails); return getDataTable(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index e312099e..c01b4096 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -89,9 +89,9 @@ public class RepairController extends BaseController { @GetMapping("/getDetailsList") //@RequiresPermissions(value = "repair:manage:list") public TableDataInfo getDetailsList(RepairPartDetails bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(deptId); + startPage(); List list = service.getDetailsList(bean); return getDataTable(list); } @@ -106,9 +106,9 @@ public class RepairController extends BaseController { @GetMapping("/getDetailsListApp") //@RequiresPermissions(value = "repair:manage:list") public TableDataInfo getDetailsListApp(RepairPartDetails bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(deptId); + startPage(); List list = service.getDetailsListApp(bean); return getDataTable(list); } @@ -317,9 +317,9 @@ public class RepairController extends BaseController { @GetMapping("getRepairedList") //@RequiresPermissions("warehousing:repair:list") public TableDataInfo getRepairedList(RepairInputDetailsVo dto) { - startPage(); Long deptId = typeService.getUserDeptId(); dto.setCompanyId(deptId); + startPage(); List list = service.getRepairedList(dto); return getDataTable(list); } @@ -328,9 +328,9 @@ public class RepairController extends BaseController { @GetMapping("getRepairedDetailList") //@RequiresPermissions("warehousing:repair:list") public TableDataInfo getRepairedDetailList(RepairInputDetailsVo dto) { - startPage(); Long deptId = typeService.getUserDeptId(); dto.setCompanyId(deptId); + startPage(); List list = service.getRepairedDetailList(dto); return getDataTable(list); } @@ -416,9 +416,9 @@ public class RepairController extends BaseController { @GetMapping("/getRepairInspection") public TableDataInfo getRepairInspection(RepairInspection dto) { try { - startPage(); Long deptId = typeService.getUserDeptId(); dto.setCompanyId(deptId); + startPage(); List list = service.getRepairInspection(dto); return getDataTable(list); } catch (Exception e) { @@ -447,9 +447,9 @@ public class RepairController extends BaseController { @GetMapping("/getTestRecord") public TableDataInfo getTestRecord(TestRecord dto) { try { - startPage(); Long deptId = typeService.getUserDeptId(); dto.setCompanyId(deptId); + startPage(); List list = service.getTestRecord(dto); return getDataTable(list); } catch (Exception e) { @@ -494,9 +494,9 @@ public class RepairController extends BaseController { @ApiOperation(value = "查询在修工程维修列表") @GetMapping("/getRepairProjectList") public AjaxResult getRepairProjectList(RepairProjectInfo bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(deptId); + startPage(); List list = service.getRepairProjectList(bean); return AjaxResult.success(getDataTable(list)); } @@ -525,9 +525,9 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取配件查询列表--分页") @GetMapping("/getPartUsingList") public TableDataInfo getPartUsingList(PartDetails bean) { - startPage(); Long deptId = typeService.getUserDeptId(); bean.setCompanyId(deptId); + startPage(); List list = service.getPartUsingList(bean); return getDataTable(list); }