feat(dms): 添加设备名称字段并实现关联查询

- 在 DmsInspectInstanceDetail 实体中新增 machineName 字段
- 添加 DmsBaseMachineInfo 和 DmsInspectRouteDetail 的依赖引入
- 实现设备表关联查询以获取设备名称功能
- 优化查询条件确保数据准确性
- 更新业务逻辑层适配新的查询结构
master
zangch@mesnac.com 2 days ago
parent 9d5753abdb
commit 538f885f40

@ -90,4 +90,10 @@ public class DmsInspectInstanceDetail extends TenantEntity {
@TableField(exist = false)
private List<DmsInspectInstanceDetailProject> dmsInspectInstanceDetailProjectList;
/**
*
*/
@TableField(exist = false)
private String machineName;
}

@ -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())

Loading…
Cancel
Save