feat(dms): 巡检路线明细添加标准名称字段

- 在 DmsInspectRouteDetail 模型中添加 standardName 字段
- 在 DmsInspectRouteDetailServiceImpl服务中加入标准名称的查询
- 在 DmsInspectRouteDetailVo 视图中添加 standardName 字段
master
zch 1 month ago
parent 52c730ca42
commit f53e48c04d

@ -64,4 +64,11 @@ public class DmsInspectRouteDetail extends TenantEntity {
@TableField(exist = false)
private String machineName;//JOIN
/**
*
*/
@TableField(exist = false)
private String standardName;
}

@ -75,4 +75,9 @@ public class DmsInspectRouteDetailVo implements Serializable {
*/
private String machineName;//JOIN
/**
*
*/
private String standardName;//JOIN
}

@ -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;

Loading…
Cancel
Save