diff --git a/com.actionsoft.apps.coe.pal.processlist/lib/com.actionsoft.apps.coe.pal.processlist.jar b/com.actionsoft.apps.coe.pal.processlist/lib/com.actionsoft.apps.coe.pal.processlist.jar index 5b23cc15..3f959206 100644 Binary files a/com.actionsoft.apps.coe.pal.processlist/lib/com.actionsoft.apps.coe.pal.processlist.jar and b/com.actionsoft.apps.coe.pal.processlist/lib/com.actionsoft.apps.coe.pal.processlist.jar differ diff --git a/com.actionsoft.apps.coe.pal.processlist/src/com/actionsoft/apps/coe/pal/processlist/web/PALRepositoryListWeb.java b/com.actionsoft.apps.coe.pal.processlist/src/com/actionsoft/apps/coe/pal/processlist/web/PALRepositoryListWeb.java index c598e9fa..c5b7b759 100644 --- a/com.actionsoft.apps.coe.pal.processlist/src/com/actionsoft/apps/coe/pal/processlist/web/PALRepositoryListWeb.java +++ b/com.actionsoft.apps.coe.pal.processlist/src/com/actionsoft/apps/coe/pal/processlist/web/PALRepositoryListWeb.java @@ -14,6 +14,7 @@ import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache; import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodAttributeModel; import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryAPIManager; +import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache; import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory; @@ -37,6 +38,8 @@ import com.actionsoft.apps.coe.pal.processlist.util.ExportAPIManager; import com.actionsoft.apps.coe.pal.processlist.util.ProcessListUtil; import com.actionsoft.apps.coe.pal.util.SubUtil; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; +import com.actionsoft.bpms.bpmn.engine.cache.ProcessDefCache; +import com.actionsoft.bpms.bpmn.engine.model.def.ProcessDefinition; import com.actionsoft.bpms.org.model.DepartmentModel; import com.actionsoft.bpms.server.fs.dc.DCProfileManager; import com.actionsoft.bpms.util.ConsolePrinter; @@ -1303,6 +1306,28 @@ public class PALRepositoryListWeb extends ActionWeb { columMap.put(count, map); count++; cellIndex = cellIndex + maxLevel + 1;// 第一列+level所占列数+空闲一列 + + // 模型名称 + HSSFCell modelNameCell = row.createCell(++cellIndex); + modelNameCell.setCellValue(model.getName()); + // 版本号 + String versionCellVar = VersionUtil.getVersionStrV(model.getVersion()); + boolean isCorrelateBpms = PALRepositoryQueryAPIManager.getInstance().isCorrelateBpms(model.getId(), true); + if (isCorrelateBpms){ + String processDefId = PALRepositoryQueryAPIManager.getInstance().queryBpmsProcessDefIdByPalId(model.getId(), true); + String appId = ProcessDefCache.getInstance().get(processDefId).getAppId(); + List versionList = ProcessDefCache.getInstance().getListOfProcessVersion(appId, processDefId); + for (ProcessDefinition processDefinition : versionList) { + String plId = PALRepositoryQueryAPIManager.getInstance().queryPlIdByPlAwsId(processDefinition.getId()); + if (UtilString.isEmpty(plId)) continue; + PALRepositoryModel m = PALRepositoryCache.getCache().get(plId); + if (!m.isUse()) continue; + versionCellVar = VersionUtil.getVersionStrV(processDefinition.getVersionNo()); + } + } + HSSFCell versionCell = row.createCell(++cellIndex); + versionCell.setCellValue(versionCellVar); + long s5 = System.currentTimeMillis(); // 扩展属性 boolean extendAttr = false; @@ -1438,6 +1463,10 @@ public class PALRepositoryListWeb extends ActionWeb { } } result.add("");// 空一列 + + // 伊利定制化需求23-11-21 空白列与扩展列之间增加 模型名称与版本号两列 + result.add("模型名称"); + result.add("版本号"); // excel表格扩展字段 for (int i = 0; i < tableHeadConfigArr.size(); i++) { result.add(tableHeadConfigArr.getJSONObject(i).getString("name"));