diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index 5dd50e6f..3ac2e04a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -80,13 +80,23 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS /** * 查询故障报修工单 + * 包含维修零件列表,前端只需调用此接口即可获取完整工单信息 * * @param repairInstanceId 主键 - * @return 故障报修工单 + * @return 故障报修工单(含零件列表) */ @Override public DmsBillsFaultInstanceVo queryById(Long repairInstanceId){ - return baseMapper.selectVoById(repairInstanceId); + DmsBillsFaultInstanceVo vo = baseMapper.selectVoById(repairInstanceId); + if (vo != null) { + // 查询维修零件列表(不使用分页,避免SQL Server OFFSET语法问题) + List partsList = dmsFaultComponentsPartsMapper.selectList( + new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() + .eq(DmsFaultComponentsParts::getRepairInstanceId, repairInstanceId) + ); + vo.setParts(partsList); + } + return vo; } /**