diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java index 4c3edad..0e5638a 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java @@ -152,4 +152,10 @@ public class QcInspectionMain extends TenantEntity { private String delFlag; + /** + * 模板名称 + */ + @TableField(exist = false) + private String templateName;//join + } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java index 0438475..047a5d8 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java @@ -143,5 +143,10 @@ public class QcInspectionMainBo extends BaseEntity { */ private String remark; + /** + * 模板名称 + */ + private String templateName;//join + } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java index c2831b0..a9ace30 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java @@ -178,5 +178,10 @@ public class QcInspectionMainVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 模板名称 + */ + private String templateName;//join + } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java index bee4160..af669f8 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.qms.domain.QcInspectionTemplate; import org.springframework.stereotype.Service; import org.dromara.qms.domain.bo.QcInspectionMainBo; import org.dromara.qms.domain.vo.QcInspectionMainVo; @@ -73,6 +74,11 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionMain.class) .selectAll(QcInspectionMain.class) + + //关联模板主表 + .select(QcInspectionTemplate::getTemplateName) + .leftJoin(QcInspectionTemplate.class, QcInspectionTemplate::getTemplateId, QcInspectionMain::getTemplateId) + .eq(bo.getInspectionId() != null, QcInspectionMain::getInspectionId, bo.getInspectionId()) .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcInspectionMain::getInspectionNo, bo.getInspectionNo()) .eq(bo.getTemplateId() != null, QcInspectionMain::getTemplateId, bo.getTemplateId())