diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java index 8147817c..fb53e87f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java @@ -25,4 +25,7 @@ public class ProReTemplateTankVO extends ProReTemplateTank { @Schema(description = "detail 具体明细") List childrenList; + + private String centerName; + private String processName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 7944e1e2..79cd2025 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -14,7 +14,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.pojo.entity.WorkCenter; +import org.springblade.desk.basic.service.IWorkCenterService; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; +import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity; +import org.springblade.desk.dashboard.service.IBsProcessSetService; import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.mapper.ProReTemplateMapper; @@ -58,6 +62,10 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl selectProReTemplatePage(IPage page, ProReTemplateVO proReTemplate) { @@ -75,6 +83,17 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl tankVOList = tankService.getListByTemplateId(vo.getId()); @@ -87,6 +106,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); tankVO.setChildrenList(detailVOList); }