diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index af77a297..749c6ccc 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java index e2d95380..3514e4ea 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java @@ -833,4 +833,16 @@ public class PublisherController { } + /** + * 发布变更流程:下拉获取最新架构进行赋值 + * @param me + * @param plId + * @return + */ + @Mapping("com.actionsoft.apps.coe.pal.publisher_publish_updateFramework") + public String updateFramework(UserContext me,String uuid,String processInstId) { + ProcessPublishWeb web = new ProcessPublishWeb(me); + return web.updateFramework(uuid,processInstId); + } + } \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 5d134610..b9ff69ac 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -24,8 +24,10 @@ import java.util.stream.Collectors; import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel; import com.actionsoft.apps.coe.pal.system.util.StringUtil; +import com.actionsoft.exception.AWSDataAccessException; import com.actionsoft.sdk.local.api.BOAPI; import com.actionsoft.sdk.local.api.BOQueryAPI; +import com.awspaas.user.apps.yili.reportform.util.RepositoryAttribute; import org.apache.commons.lang.StringUtils; import com.actionsoft.apps.coe.pal.constant.CoEConstant; @@ -4486,5 +4488,32 @@ public class ProcessPublishWeb extends ActionWeb { } + /** + * 发布变更版本流程-根据下拉选择获取最新架构数据赋值到发布表单中 + * @return + */ + public String updateFramework(String uuid,String processInstId){ + boolean iswrong = false; + JSONObject result = new JSONObject(); + if(processInstId==null){ + return ResponseObject.newErrResponse("流程实例未找到").toString(); + } + ResponseObject ro = ResponseObject.newOkResponse(); + try { + + //ID获取L1 L2 L3的值 + List resulttmp = DBSql.getMaps(String.format("select PROPERTYID,PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PROPERTYID in ('Process_Architecture_L1','Process_Architecture_L2','Process_Architecture_L3','Process_Architecture_L4') AND PLID='%s'", uuid)); + for (RowMap tmp : resulttmp) { + String key = tmp.getString("PROPERTYID"); + String value = tmp.getString("PROPERTYVALUE"); + result.put(key, value); + } + ro.put("data", result); + ro.put("info", iswrong); + } catch (AWSDataAccessException e) { + e.printStackTrace(); + } + return ro.toString(); + } } \ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index 603f0580..39877f63 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -259,7 +259,8 @@ function initHtml() { newHtml += ''; // newHtml += ''; newHtml += ''; - newHtml += ''; + newHtml += ''; + newHtml += ''; } //newHtml += ''; // newHtml += ''; @@ -291,7 +292,8 @@ function initHtml() { changeHtml += ''; // changeHtml += ''; changeHtml += ''; - changeHtml += ''; + changeHtml += ''; + changeHtml += ''; } //changeHtml += ''; // changeHtml += ''; @@ -458,7 +460,7 @@ function initPublishData(data, type, pageNumber, start){ // 初始化数据 function selectPublishData(data, type, pageNumber, start) { - + debugger; //渲染到前台的流程架构L1,L2,L3,L4 var param = { cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', @@ -1070,7 +1072,8 @@ function initChangedData(changeFileId) { } else { $('#report_' + changeFileId).html('无'); } - + //获取选中模型数据,更新架构数据 + updateFramework(changeTemp[i].changedFileIdNew); break; } } @@ -1121,8 +1124,6 @@ function refreshManual(processInstId,type) { data : param, success : function(r) { if (r.result == 'ok') { - - FormToolBarAction.BTN_SAVE(); AWSFormUtil.refreshPage(); } @@ -2586,3 +2587,38 @@ function downloadReport(uuid, taskId) { } + +//刷新页面 +function getFiles() { + FormToolBarAction.BTN_SAVE(); + AWSFormUtil.refreshPage(); +} + + +//下拉获取最新架构进行赋值操作 +function updateFramework(uuid) { + awsui.ajax.request({ + type: "POST", + url: "./jd", + async: false, + data: { + sid: sid, + cmd: "com.actionsoft.apps.coe.pal.publisher_publish_updateFramework", + uuid: uuid, + processInstId:processInstId + }, + success : function(r) { + if (r.result == "ok") { + var L1 = r.data.data.Process_Architecture_L1; + var L2 = r.data.data.Process_Architecture_L2; + var L3 = r.data.data.Process_Architecture_L3; + var L4 = r.data.data.Process_Architecture_L4; + ui("LEVEL_1_PROCESS_NAME",L1); + ui("LEVEL_2_PROCESS_NAME",L2); + ui("LEVEL_3_PROCESS_NAME",L3); + ui("LEVEL_4_PROCESS_NAME",L4); + } + } + }); + +}