From 109a9c401dd72abc3ac0ddce1294997f3e15d90d Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Wed, 24 Aug 2022 10:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=85=E8=A7=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/coe/pal/CoEPALController.java | 2 +- .../manage/publish/dao/PublishListHistory.java | 3 ++- .../designer/web/CoeDesignerWeb.java | 18 +++++++++++------- .../pal/repository/web/CoeProcessLevelWeb.java | 11 +++++++++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index f9dcf315..62bb4cec 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -2995,7 +2995,7 @@ public class CoEPALController { /** - * 弹窗新建角色图形创建相应图形 + * 创建角色/绩效/表单模型 * @param me * @param * @return diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java index 6d320835..26beec57 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/manage/publish/dao/PublishListHistory.java @@ -452,7 +452,8 @@ public final class PublishListHistory extends DaoObject * @return */ public String getLastPublishTaskIdByModelId(String repositoryId) { - String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC"; + //String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC"; + String sql="SELECT TASKID FROM BO_ACT_COE_PUBLISH_N where PUBLISHFILEID=?"; String taskId = DBSql.getObject(sql, new RowMapper() { @Override public String mapRow(ResultSet rs, int arg1) throws SQLException { diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java index e2b804ec..a55cb621 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java @@ -2880,13 +2880,17 @@ public class CoeDesignerWeb extends ActionWeb { if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) { macroLibraries.put("outputFileName", plModel.getName() + ".doc"); macroLibraries.put("taskId", taskId); - // 压缩包名称 和 手册模板 - OutputTaskModel taskModel = new OutputTask().getTaskReportById(taskId); - // 压缩包名称 - macroLibraries.put("taskName", taskModel.getTaskName() + ".zip"); - OutputAppProfile appFile = OutputAppManager.getProfile(taskModel.getProfileId()); - // 手册模板（com.actionsoft.apps.coe.pal.output.pr） - macroLibraries.put("taskProfile", appFile.getAppContext().getId()); + if(UtilString.isNotEmpty(taskId)){ + // 压缩包名称 和 手册模板 + OutputTaskModel taskModel = new OutputTask().getTaskReportById(taskId); + + // 压缩包名称 + macroLibraries.put("taskName", taskModel.getTaskName() + ".zip"); + OutputAppProfile appFile = OutputAppManager.getProfile(taskModel.getProfileId()); + // 手册模板（com.actionsoft.apps.coe.pal.output.pr） + macroLibraries.put("taskProfile", appFile.getAppContext().getId()); + } + } String type = CoeDesignerConstant.DESIGNER_DIFINITION_DEFAULT; diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index fc375ed3..698f8084 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -8496,10 +8496,18 @@ public class CoeProcessLevelWeb extends ActionWeb { defineModel.setCreateHistory(false); } + + String define = defineModel.getDefinition(); JSONObject definition = JSONObject.parseObject(define); JSONObject elements = definition.getJSONObject("elements"); + Iterator ite = elements.keySet().iterator(); + while (ite.hasNext()) { + String key = ite.next(); + JSONObject shape = elements.getJSONObject(key); + String name = shape.getString("name"); + } //新建一个uuid String shapeId = UUIDGener.getObjectId(); @@ -8518,7 +8526,6 @@ public class CoeProcessLevelWeb extends ActionWeb { for (PALMethodAttributeModel attributeModel : attributeModels) { //todo：根据importProperty的类型获取具体保存数据值 - JSONObject arributeObj = new JSONObject(); arributeObj.put("key", attributeModel.getKey()); arributeObj.put("isRequired", attributeModel.getIsRequired()); @@ -8544,7 +8551,7 @@ public class CoeProcessLevelWeb extends ActionWeb { } } - + //shape.put("dataAttributes", dataAttributes); /************************************************文件属性*********************************************************/