diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java index 2d186eaf..87ab00e0 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java @@ -90,4 +90,10 @@ public class DmsInspectInstanceDetail extends TenantEntity { @TableField(exist = false) private List dmsInspectInstanceDetailProjectList; + /** + * 设备名称 + */ + @TableField(exist = false) + private String machineName; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java index 8567a4c6..12367dec 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java @@ -9,8 +9,10 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.DmsBaseMachineInfo; import org.dromara.dms.domain.DmsBillsInspectInstance; import org.dromara.dms.domain.DmsInspectInstanceDetail; +import org.dromara.dms.domain.DmsInspectRouteDetail; import org.dromara.dms.domain.bo.DmsInspectInstanceDetailBo; import org.dromara.dms.domain.vo.DmsBillsInspectInstanceVo; import org.dromara.dms.domain.vo.DmsInspectInstanceDetailVo; @@ -76,6 +78,11 @@ public class DmsInspectInstanceDetailServiceImpl implements IDmsInspectInstanceD Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsInspectInstanceDetail.class) .selectAll(DmsInspectInstanceDetail.class) + + //关联查询设备 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId, DmsInspectRouteDetail::getMachineId) + .eq(bo.getInstanceDetailId() != null, DmsInspectInstanceDetail::getInstanceDetailId, bo.getInstanceDetailId()) .eq(bo.getInspectInstanceId() != null, DmsInspectInstanceDetail::getInspectInstanceId, bo.getInspectInstanceId()) .eq(bo.getLineStep() != null, DmsInspectInstanceDetail::getLineStep, bo.getLineStep())