From af01c6209d4545cb9b00dbacca28510aa37663d8 Mon Sep 17 00:00:00 2001 From: zhouxinyu <121470181@qq.com> Date: Mon, 17 Feb 2025 09:10:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/contraller/DeviceController.java | 6 +- .../modules/business/mapper/DeviceMapper.xml | 15 +- .../mapper/MaintenanceTaskDetailMapper.xml | 2 +- .../service/impl/DeviceServiceImpl.java | 12 +- .../MaintenanceTaskDetailServiceImpl.java | 134 +++++++++++------- .../excel/MaintenanceTaskReport.xlsx | Bin 14701 -> 15209 bytes src/main/resources/excel/RepairService.xlsx | Bin 12768 -> 13259 bytes 7 files changed, 104 insertions(+), 65 deletions(-) diff --git a/src/main/java/org/springblade/modules/business/contraller/DeviceController.java b/src/main/java/org/springblade/modules/business/contraller/DeviceController.java index 85d8452..7ff5d08 100644 --- a/src/main/java/org/springblade/modules/business/contraller/DeviceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/DeviceController.java @@ -116,11 +116,15 @@ public class DeviceController extends BladeController { if(CollectionUtil.isNotEmpty(deptList)){ deptIds = deptList.stream().map(Dept::getId).map(x->x+"").collect(Collectors.toList()); } + deptIds.add(deptId); wrapper.in(Device::getLimsId,deptIds); }else{ wrapper.eq(Device::getLimsId,user.getDeptId()); } - + if(user.getRoleName().equals("客服") || user.getRoleName().equals("维修负责人")){ + wrapper.or(wq -> wq.eq(Device::getCreateDept, user.getDeptId())); + } + wrapper.or(wq -> wq.eq(Device::getCreateUser, userId)); } diff --git a/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml b/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml index 630e9c6..3aa1e66 100644 --- a/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/DeviceMapper.xml @@ -17,11 +17,14 @@ diff --git a/src/main/java/org/springblade/modules/business/mapper/MaintenanceTaskDetailMapper.xml b/src/main/java/org/springblade/modules/business/mapper/MaintenanceTaskDetailMapper.xml index 9fe4ef4..eb1fa2c 100644 --- a/src/main/java/org/springblade/modules/business/mapper/MaintenanceTaskDetailMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/MaintenanceTaskDetailMapper.xml @@ -27,7 +27,7 @@