|
|
@ -11,6 +11,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import org.dromara.dms.domain.DmsBaseInspectRoute;
|
|
|
|
import org.dromara.dms.domain.DmsBaseInspectRoute;
|
|
|
|
|
|
|
|
import org.dromara.dms.domain.DmsBaseInspectStandard;
|
|
|
|
import org.dromara.dms.domain.DmsBaseMachineInfo;
|
|
|
|
import org.dromara.dms.domain.DmsBaseMachineInfo;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo;
|
|
|
|
import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo;
|
|
|
@ -83,10 +84,16 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
|
|
|
|
.select(DmsBaseMachineInfo::getMachineName)
|
|
|
|
.select(DmsBaseMachineInfo::getMachineName)
|
|
|
|
.leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsInspectRouteDetail::getMachineId)
|
|
|
|
.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.getRouteDetailId() != null, DmsInspectRouteDetail::getRouteDetailId, bo.getRouteDetailId())
|
|
|
|
.eq(bo.getInspectRouteId() != null, DmsInspectRouteDetail::getInspectRouteId, bo.getInspectRouteId())
|
|
|
|
.eq(bo.getInspectRouteId() != null, DmsInspectRouteDetail::getInspectRouteId, bo.getInspectRouteId())
|
|
|
|
.eq(bo.getLineStep() != null, DmsInspectRouteDetail::getLineStep, bo.getLineStep())
|
|
|
|
.eq(bo.getLineStep() != null, DmsInspectRouteDetail::getLineStep, bo.getLineStep())
|
|
|
|
.eq(bo.getMachineId() != null, DmsInspectRouteDetail::getMachineId, bo.getMachineId())
|
|
|
|
.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())
|
|
|
|
.eq(StringUtils.isNotBlank(bo.getInspectStandard()), DmsInspectRouteDetail::getInspectStandard, bo.getInspectStandard())
|
|
|
|
.orderByDesc(DmsInspectRouteDetail::getCreateTime);
|
|
|
|
.orderByDesc(DmsInspectRouteDetail::getCreateTime);
|
|
|
|
return lqw;
|
|
|
|
return lqw;
|
|
|
|