diff --git a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenProject.java b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenProject.java index 1ff8f8c..ccee17d 100644 --- a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenProject.java +++ b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenProject.java @@ -55,6 +55,8 @@ public class GenProject extends BaseEntity @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; + private transient Boolean frontDraft; + private List tables; public void setProjectId(Long projectId) @@ -165,6 +167,18 @@ public class GenProject extends BaseEntity this.tables = tables; } + public Boolean getFrontDraft() { + return frontDraft; + } + + public void setFrontDraft(Boolean frontDraft) { + this.frontDraft = frontDraft; + } + + public boolean isFrontDraft() { + return Boolean.TRUE.equals(frontDraft); + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -185,4 +199,4 @@ public class GenProject extends BaseEntity .append("remark", getRemark()) .toString(); } -} \ No newline at end of file +} diff --git a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java index 67b5eb2..1181a5a 100644 --- a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java +++ b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java @@ -236,6 +236,9 @@ public class GenProjectServiceImpl implements IGenProjectService { } private List getProjectModules(GenProject project) { + if (project.isFrontDraft()) { + return new ArrayList(); + } SysProjectModule projectModuleFilter = new SysProjectModule(); projectModuleFilter.setProjectId(project.getProjectId()); return sysProjectModuleService.selectSysProjectModuleList(projectModuleFilter); @@ -250,11 +253,17 @@ public class GenProjectServiceImpl implements IGenProjectService { } private SysProjectTemplate resolveProjectTemplate(GenProject project, String type) { - SysProjectTemplate projectTemplate = sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(project.getProjectId(), type); - if (projectTemplate != null && projectTemplate.getTemplateId() != null) { - return projectTemplate; + if (!project.isFrontDraft()) { + SysProjectTemplate projectTemplate = sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(project.getProjectId(), type); + if (projectTemplate != null && projectTemplate.getTemplateId() != null) { + return projectTemplate; + } } + return resolveActiveTemplate(project.getProjectId(), type); + } + + private SysProjectTemplate resolveActiveTemplate(Long projectId, String type) { Template templateFilter = new Template(); templateFilter.setTemplateType(type); List