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 8f8de4ba..0a8a149c 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/event/PublishExecuteListenerInterfaceImpl.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java index 59414f93..510a925a 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java @@ -503,25 +503,29 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme * 发布明细如果关联角色、绩效图,不显示在发布界面,在流程结束后同步发布 */ public void updateRoleAndPerformance(String publishFileId,Timestamp publishDate,String type){ - List roleList=new ArrayList(); - roleList.add(0,"org.role"); - roleList.add(1,publishFileId); - PALRepository repositoryDao = new PALRepository(); - RowMap rolerowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?",roleList.toString()); + try { + List roleList = new ArrayList(); + roleList.add(0, "org.role"); + roleList.add(1, publishFileId); + PALRepository repositoryDao = new PALRepository(); + RowMap rolerowMap = DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?", roleList.toString()); - if(rolerowMap!=null){ - //修改流程文件的发布属性 - repositoryDao.updatePublishStatusAndDate(type, rolerowMap.getString("ID"), null, publishDate); - } - List performanceList=new ArrayList(); - performanceList.add(0,"control.kpi"); - performanceList.add(1,publishFileId); + if (rolerowMap != null) { + //修改流程文件的发布属性 + repositoryDao.updatePublishStatusAndDate(type, rolerowMap.getString("ID"), null, publishDate); + } + List performanceList = new ArrayList(); + performanceList.add(0, "control.kpi"); + performanceList.add(1, publishFileId); - RowMap performrowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?",performanceList.toString()); + RowMap performrowMap = DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?", performanceList.toString()); - if(performrowMap!=null){ - //修改流程文件的发布属性 - repositoryDao.updatePublishStatusAndDate(type, performrowMap.getString("ID"), null, publishDate); + if (performrowMap != null) { + //修改流程文件的发布属性 + repositoryDao.updatePublishStatusAndDate(type, performrowMap.getString("ID"), null, publishDate); + } + } catch (AWSDataAccessException e) { + e.printStackTrace(); } } diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java index 5c7f67a5..4386d99b 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java @@ -1,5 +1,6 @@ package com.actionsoft.apps.coe.pal.publisher.event; +import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishHistoryModel; import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishListHistoryModel; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository; @@ -38,6 +39,7 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements @Override public void execute(ProcessExecutionContext param) throws Exception { + PublishHistoryModel model = new PublishHistoryModel(); String processInstId = param.getProcessInstance().getId(); BO bo = SDK.getBOAPI().query(PublisherConstant.BOTABLENAME).detailByBindId(processInstId); List bolistN = SDK.getBOAPI().query(PublisherConstant.BOSUBTABLE_N).bindId(processInstId).list(); @@ -55,6 +57,13 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements } } + if (bolistC != null) { + for (BO boC : bolistC) { + //修改流程文件的发布属性 + repositoryDao.updatePublishStatusAndDate("C", boC.get("CHANGEDFILEIDNEW").toString(), boC.get("CHANGEFILEID").toString(), model.getPublishDate()); + } + } + } diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js index 3b3e2664..0f681f50 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js @@ -4,24 +4,14 @@ var newTemp; var changeTemp; var stopTemp; -/** - * 获取地址参数 - * @param name - * @returns {*} - * @constructor - */ -function GetQueryString(name) { - var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); - var r = window.location.search.substr(1).match(reg); - if(r!=null)return unescape(r[2]); return null; -} + /** * 初始移动端明细数据 */ function initMobileData() { - + getWsId(); /** * 获取访问地址得到参数判断 * @type {*} @@ -37,6 +27,18 @@ function initMobileData() { } } + /** + * 获取地址参数 + * @param name + * @returns {*} + * @constructor + */ + function GetQueryString(name) { + var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); + var r = window.location.search.substr(1).match(reg); + if(r!=null)return unescape(r[2]); return null; + } + $("table[id^='AWS-MobileGrid-Zone']").empty(); $("table[id^='AWS-MobileGrid-Zone']").html(''); @@ -106,6 +108,28 @@ function initMobileData() { } +//获取wsid +function getWsId() { + var param = { + sid : $("#sid").val(), + cmd : "com.actionsoft.apps.coe.pal.publisher_publish_getWsId" + } + $.ajax({ + url : "./jd", + type : "POST", + dataType : "JSON", + data : param, + async: false, + success : function(r) { + if (r.result == 'ok') { + var wsId=$("#WSID").val(); + if(wsId==""){ + $("#WSID").val(r.data.wsId); + } + } + } + }); +} // 主体内容显示与隐藏