From 0960d041941196d25ab44732c5cbb38a43c19e33 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 14 Jan 2026 14:16:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=9F=A5=E8=AF=A2=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E6=8A=A5=E4=BF=AE=E5=B7=A5=E5=8D=95=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=B4=E4=BF=AE=E9=9B=B6=E4=BB=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在查询故障报修工单接口中增加维修零件列表数据 - 修复SQL Server OFFSET语法兼容性问题 - 优化查询逻辑以支持完整工单信息获取 - 更新返回对象结构以包含零件列表字段 - 添加查询条件过滤确保数据准确性 - 修改接口文档注释以反映新的功能特性 --- .../impl/DmsBillsFaultInstanceServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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; } /**