From 585f2b3e48d7767c4af62c587502bcf7120a0b44 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 18 Jul 2024 10:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=9D=BF=E5=9D=97=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/RoleDataServiceImpl.java | 10 ++++++++++ .../java/org/energy/modules/system/vo/HomePageVO.java | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java index 94c11be..baa9881 100644 --- a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java +++ b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java @@ -17,6 +17,8 @@ package org.energy.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dayu.daf.core.tool.constant.DafConstant; +import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.inspection.service.IInspectionTasksService; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; import org.energy.modules.leger.service.IEquipmentLedgerService; @@ -66,6 +68,8 @@ public class RoleDataServiceImpl implements IRoleDataService { private IMaterialService materialService; @Autowired private IWorkOrderService workOrderService; + @Autowired + private IInspectionTasksService inspectionTasksService; @Override public HomePageVO findCurrHomePageInfo() { @@ -125,6 +129,12 @@ public class RoleDataServiceImpl implements IRoleDataService { qw9.lambda().eq(WorkOrder::getIsDeleted, DafConstant.DB_NOT_DELETED); hp.setWorkOrderAudit(workOrderService.list(qw9)); + // Inspection Tasks Service + QueryWrapper qw10 = new QueryWrapper<>(); + qw10.lambda().eq(InspectionTasks::getTaskStatus, 1); + qw10.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setInspectionTasksAudit(inspectionTasksService.list(qw10)); + return hp; } diff --git a/src/main/java/org/energy/modules/system/vo/HomePageVO.java b/src/main/java/org/energy/modules/system/vo/HomePageVO.java index 17a9e6c..f92a6a9 100644 --- a/src/main/java/org/energy/modules/system/vo/HomePageVO.java +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -1,6 +1,7 @@ package org.energy.modules.system.vo; import lombok.Data; +import org.energy.modules.inspection.entity.InspectionTasks; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; import org.energy.modules.smart.entity.OperationTicket; @@ -16,6 +17,9 @@ import java.util.List; @Data public class HomePageVO { + // 巡检任务 + private List inspectionTasksAudit; + // 设备台账 private List equipmentLedgerAudit; private List toolInventoryRecordsAudit;