Compare commits

...

2 Commits

Author SHA1 Message Date
qiongli
3282427d46 fix(TDQ-19637): code format 2021-08-06 09:51:12 +08:00
qiongli
0f9548705e fix(TDQ-19637):Judge if it includes 'tdqReportRun' in main/sub-job when
generate code.
2021-08-05 17:59:24 +08:00
3 changed files with 1627 additions and 1650 deletions

View File

@@ -117,7 +117,6 @@ public abstract class AbstractPublishJobAction implements IRunnableWithProgress
exportChoiceMap.put(ExportChoice.needContext, true);
ProcessItem processItem = (ProcessItem) node.getObject().getProperty().getItem();
exportItemForDQComponent(processItem);
String contextName = (String) exportChoiceMap.get(ExportChoice.contextName);
if (contextName == null) {
@@ -148,17 +147,6 @@ public abstract class AbstractPublishJobAction implements IRunnableWithProgress
}
}
/**
* TDQ-15391: when have tDqReportRun, must always export items.
*
* @param processItem
*/
private void exportItemForDQComponent(ProcessItem processItem) {
if (EmfModelUtils.getComponentByName(processItem, "tDqReportRun") != null) { //$NON-NLS-1$
exportChoiceMap.put(ExportChoice.needJobItem, true);
}
}
private void exportJobForPOJO(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
File tmpJob = null;
try {
@@ -178,7 +166,6 @@ public abstract class AbstractPublishJobAction implements IRunnableWithProgress
exportChoiceMap.put(ExportChoice.addStatistics, true);
ProcessItem processItem = (ProcessItem) node.getObject().getProperty().getItem();
exportItemForDQComponent(processItem);
String contextName = (String) exportChoiceMap.get(ExportChoice.contextName);
if (contextName == null) {
@@ -219,7 +206,6 @@ public abstract class AbstractPublishJobAction implements IRunnableWithProgress
exportChoiceMap.put(ExportChoice.addStatistics, true);
ProcessItem processItem = (ProcessItem) node.getObject().getProperty().getItem();
exportItemForDQComponent(processItem);
String contextName = (String) exportChoiceMap.get(ExportChoice.contextName);
if (contextName == null) {

View File

@@ -269,6 +269,9 @@ public class BuildJobHandler extends AbstractBuildJobHandler {
FilesUtils.deleteFolder(reports, false);
}
}
if (ProcessorUtilities.isNeedExportItemsForDQ()) {
exportChoice.put(ExportChoice.needJobItem, true);
}
if (isOptionChoosed(ExportChoice.needJobItem)) {
File destination = new File(itemsFolder.getLocation().toFile().getAbsolutePath());
exportItemUtil.setProjectNameAsLowerCase(isProjectNameLowerCase());