|
|
|
|
@ -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<String, Object> params = bo.getParams();
|
|
|
|
|
MPJLambdaWrapper<DmsInspectInstanceDetail> 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())
|
|
|
|
|
|