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 749c6ccc..dcc3477e 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 05ac7bbe..678ceb1a 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 @@ -756,9 +756,9 @@ public class PublisherController { * @return */ @Mapping("com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs") - public String getPublishNameByJs(UserContext me,String processInstId,String wsId,String datas){ + public String getPublishNameByJs(UserContext me,String processInstId,String wsId,String type,String datas){ ProcessPublishWeb publishWeb = new ProcessPublishWeb(me); - return publishWeb.getLevelByData(me,wsId,datas); + return publishWeb.getLevelByData(me,wsId,type,datas); } 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 3171c8e2..9ba6dbb3 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 @@ -4187,7 +4187,7 @@ public class ProcessPublishWeb extends ActionWeb { * @param datas * @return */ - public String getLevelByData(UserContext me, String wsId, String datas) { + public String getLevelByData(UserContext me, String wsId,String type,String datas) { ResponseObject ro = ResponseObject.newOkResponse(); JSONArray palarr = JSON.parseArray(datas); JSONObject result = new JSONObject(); @@ -4195,19 +4195,25 @@ public class ProcessPublishWeb extends ActionWeb { boolean iswrong = false; for (int i = 0; i < palarr.size(); i++) { JSONObject paljb = palarr.getJSONObject(i); - String id = paljb.getString("id"); - //获取最新要更新版本的id - List temp = PALRepositoryCache.getByVersionId(wsId, id); - if (temp.size() > 0) { - for (PALRepositoryModel palRepositoryModel : temp) { - if (!palRepositoryModel.isPublish() && !palRepositoryModel.isStop()) { - id = palRepositoryModel.getId(); + String id; + if(type.equals("change")){ + id = paljb.getString("changedFileIdNew"); + }else{ + id = paljb.getString("id"); + //获取最新要更新版本的id + List temp = PALRepositoryCache.getByVersionId(wsId, id); + if (temp.size() > 0) { + for (PALRepositoryModel palRepositoryModel : temp) { + if (!palRepositoryModel.isPublish() && !palRepositoryModel.isStop()) { + id = palRepositoryModel.getId(); + } } } } String methodId = paljb.getString("methodId"); PALRepositoryModel model = PALRepositoryCache.getCache().get(id); + //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'", id)); for (RowMap tmp : resulttmp) { diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/action.xml b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/action.xml index a5a8231c..b2dd0481 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/action.xml +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/action.xml @@ -448,6 +448,7 @@ + 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 39877f63..b300dffb 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 @@ -460,48 +460,53 @@ 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', - processInstId: processInstId, - wsId : wsId, - sid: sid, - datas:JSON.stringify(data) - }; - $.ajax({ - url : "./jd", - type : "POST", - dataType : "JSON", - async : true, - data : param, - success : function(r) { - var info = r.data.info; - 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; - var L1old = ui("LEVEL_1_PROCESS_NAME"); - var L2old = ui("LEVEL_2_PROCESS_NAME"); - var L3old = ui("LEVEL_3_PROCESS_NAME"); - var L4old = ui("LEVEL_4_PROCESS_NAME"); - ui("LEVEL_1_PROCESS_NAME",L1); - ui("LEVEL_2_PROCESS_NAME",L2); - ui("LEVEL_3_PROCESS_NAME",L3); - ui("LEVEL_4_PROCESS_NAME",L4); - showlist(data, type, pageNumber, start); - //发起请求把审批人查询出来~ - queryapprove(); - ui("ADAPT_NAME_THE_COMPANY",""), - ui("ADAPT_REGION_NAME",""), - ui("APPLICABLE_PRODUCT",""), - $("#publisher_dialog").dialog("close"); - //展示未发布过的流程 - //data = r.data.is_not_publish_data; - } - }); + + //渲染到前台的流程架构L1,L2,L3,L4 + var param = { + cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', + processInstId: processInstId, + wsId : wsId, + sid: sid, + type:type, + datas:JSON.stringify(data) + }; + $.ajax({ + url : "./jd", + type : "POST", + dataType : "JSON", + async : true, + data : param, + success : function(r) { + var info = r.data.info; + 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; + var L1old = ui("LEVEL_1_PROCESS_NAME"); + var L2old = ui("LEVEL_2_PROCESS_NAME"); + var L3old = ui("LEVEL_3_PROCESS_NAME"); + var L4old = ui("LEVEL_4_PROCESS_NAME"); + ui("LEVEL_1_PROCESS_NAME",L1); + ui("LEVEL_2_PROCESS_NAME",L2); + ui("LEVEL_3_PROCESS_NAME",L3); + ui("LEVEL_4_PROCESS_NAME",L4); + showlist(data, type, pageNumber, start); + //发起请求把审批人查询出来~ + queryapprove(); + ui("ADAPT_NAME_THE_COMPANY",""), + ui("ADAPT_REGION_NAME",""), + ui("APPLICABLE_PRODUCT",""), + $("#publisher_dialog").dialog("close"); + //展示未发布过的流程 + //data = r.data.is_not_publish_data; + } + }); + } + + + //by bzp function queryapprove(){ var level1 =ui("LEVEL_1_PROCESS_NAME");