From ce3f55e4daea0640fd5065b8e655c3b177e79b9b Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 25 八月 2025 15:55:22 +0800 Subject: [PATCH] 设备管理首页列表接口 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java index c4cb2a2..0f5f2b3 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java @@ -54,7 +54,6 @@ @Resource private IEamEquipmentExtendService eamEquipmentExtendService; - @Autowired private IBaseFactoryUserService baseFactoryUserService; @Autowired @@ -467,6 +466,7 @@ */ @Override public IPage<EamReportRepairDto> reportRepairList(String code, Page<EamReportRepairDto> page){ + IPage<EamReportRepairDto> eamReportRepairDtoIPage=new Page<>(); // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌� LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { @@ -503,11 +503,19 @@ queryWrapper.orderByDesc("wmo.create_time"); switch (code){ case "bx": - return baseMapper.queryPageList(page,queryWrapper); + eamReportRepairDtoIPage=baseMapper.queryPageList(page,queryWrapper); + break; case "stop": - return baseMapper.queryPageList(page,queryWrapper.eq("breakdown_flag", "1")); + eamReportRepairDtoIPage=baseMapper.queryPageList(page,queryWrapper.eq("breakdown_flag", "1")); + break; default: - return baseMapper.queryPageList(page,queryWrapper.eq("breakdown_flag", "0")); + eamReportRepairDtoIPage=baseMapper.queryPageList(page,queryWrapper.eq("breakdown_flag", "0")); + break; } + eamReportRepairDtoIPage.getRecords().forEach(eamReportRepairDto -> { + eamReportRepairDto.setTechnologyStatus(eamEquipmentExtendService.getById(eamReportRepairDto.getEquipmentId()).getTechnologyStatus()); + }); + return eamReportRepairDtoIPage; } + } -- Gitblit v1.9.3