diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java index c0d6b72d..8c8d058a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java @@ -64,4 +64,11 @@ public class DmsInspectRouteDetail extends TenantEntity { @TableField(exist = false) private String machineName;//JOIN + /** + * 标准名称 + */ + @TableField(exist = false) + private String standardName; + + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java index 34a3290d..a13797ac 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java @@ -75,4 +75,9 @@ public class DmsInspectRouteDetailVo implements Serializable { */ private String machineName;//JOIN + /** + * 标准名称 + */ + private String standardName;//JOIN + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java index 4a0ab4d0..f286503a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java @@ -11,6 +11,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.dms.domain.DmsBaseInspectRoute; +import org.dromara.dms.domain.DmsBaseInspectStandard; import org.dromara.dms.domain.DmsBaseMachineInfo; import org.springframework.stereotype.Service; import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo; @@ -83,10 +84,16 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS .select(DmsBaseMachineInfo::getMachineName) .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsInspectRouteDetail::getMachineId) + .select(DmsBaseInspectStandard::getStandardName) + .leftJoin(DmsBaseInspectStandard.class, DmsBaseInspectStandard::getInspectStandardId,DmsInspectRouteDetail::getInspectStandard) + .eq(bo.getRouteDetailId() != null, DmsInspectRouteDetail::getRouteDetailId, bo.getRouteDetailId()) .eq(bo.getInspectRouteId() != null, DmsInspectRouteDetail::getInspectRouteId, bo.getInspectRouteId()) .eq(bo.getLineStep() != null, DmsInspectRouteDetail::getLineStep, bo.getLineStep()) .eq(bo.getMachineId() != null, DmsInspectRouteDetail::getMachineId, bo.getMachineId()) + + .eq(bo.getInspectStandard() != null, DmsInspectRouteDetail::getInspectStandard, bo.getInspectStandard()) + .eq(StringUtils.isNotBlank(bo.getInspectStandard()), DmsInspectRouteDetail::getInspectStandard, bo.getInspectStandard()) .orderByDesc(DmsInspectRouteDetail::getCreateTime); return lqw;