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 baa9881..3d71f94 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 @@ -23,6 +23,8 @@ import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.ToolInventoryRecord; import org.energy.modules.leger.service.IEquipmentLedgerService; import org.energy.modules.leger.service.IToolInventoryRecordService; +import org.energy.modules.release.entity.ProductionInformation; +import org.energy.modules.release.service.IProductionInformationService; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.WorkOrder; import org.energy.modules.smart.entity.WorkPermit; @@ -70,6 +72,8 @@ public class RoleDataServiceImpl implements IRoleDataService { private IWorkOrderService workOrderService; @Autowired private IInspectionTasksService inspectionTasksService; + @Autowired + private IProductionInformationService productionInformationService; @Override public HomePageVO findCurrHomePageInfo() { @@ -135,6 +139,13 @@ public class RoleDataServiceImpl implements IRoleDataService { qw10.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); hp.setInspectionTasksAudit(inspectionTasksService.list(qw10)); + // ProductionInformation Service + QueryWrapper qw11 = new QueryWrapper<>(); + qw11.lambda().eq(ProductionInformation::getCheckstatus, 2); + qw11.lambda().eq(ProductionInformation::getIsDeleted, DafConstant.DB_NOT_DELETED); + qw11.lambda().eq(ProductionInformation::getIsDiscontinue, 1); + hp.setProductionInformationAudit(productionInformationService.list(qw11)); + 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 f92a6a9..dead014 100644 --- a/src/main/java/org/energy/modules/system/vo/HomePageVO.java +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -4,6 +4,7 @@ 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.release.entity.ProductionInformation; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.WorkOrder; import org.energy.modules.smart.entity.WorkPermit; @@ -33,4 +34,6 @@ public class HomePageVO { private List materialAudit; // 工单 private List workOrderAudit; + // 生产信息发布 + private List productionInformationAudit; }