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 c8d21d7b..68926121 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/client/util/ProcesNumberUtil.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java index bd113cc9..0fd2e4f6 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java @@ -203,7 +203,7 @@ public class ProcesNumberUtil { levelFour = "00"; } - String levelnum = levelOne + "." + levelTwo + "." + levelThree; + String levelnum = levelOne + "." + levelTwo + "." + levelThree +"."+levelFour; String updateSql = "update BO_ACT_COE_PUBLISH_C set CHANGE_NUMBER = '%s' where ID = '%s'"; rowMap = DBSql.getMap("SELECT PLVER,PLMETHODID FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID='" @@ -286,7 +286,7 @@ public class ProcesNumberUtil { levelFour = "00"; } - String levelnum = levelOne + "." + levelTwo + "." + levelThree; + String levelnum = levelOne + "." + levelTwo + "." + levelThree +"."+levelFour; String updateSql = "update BO_ACT_COE_PUBLISH_N set PUBLISH_NUMBER='%s' where ID = '%s'"; for (BO nowData : dataList) { diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java index 4e0e5556..2b29f28b 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java @@ -125,7 +125,10 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList + processExecutionContext.getTaskInstance().getId(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Timestamp endTime = processExecutionContext.getProcessInstance().getStartTime(); + //Timestamp endTime = processExecutionContext.getTaskInstance().getBeginTime(); + + Timestamp endTime = new Timestamp(System.currentTimeMillis()); + BO boActCoePublish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true) .addQuery("BINDID=", processExecutionContext.getProcessInstance().getId()) .addQuery("OPTIONTYPE IS NOT NULL", null).detail(); @@ -763,6 +766,12 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList if ("true".equals(status)) { JSONArray resultArray = JSONObject.parseArray(datas); //System.out.println(processInstance.getTitle() + "待阅推送成功：" + idList.size()+"人"); + + //插入实时更新人数表 + /* BO realTimeBO=new BO();*/ + + + for (int j = 0; j < resultArray.size(); j++) { JSONObject jsonObject2 = resultArray.getJSONObject(j); String user = jsonObject2.get("user").toString(); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java index b72519d5..b8571d20 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java @@ -126,7 +126,10 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute + processExecutionContext.getTaskInstance().getId(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Timestamp endTime = processExecutionContext.getProcessInstance().getStartTime(); + //Timestamp endTime = processExecutionContext.getTaskInstance().getBeginTime(); + Timestamp endTime = new Timestamp(System.currentTimeMillis()); + + BO boActCoePublish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true) .addQuery("BINDID=", processExecutionContext.getProcessInstance().getId()) .addQuery("OPTIONTYPE IS NOT NULL", null).detail(); @@ -149,10 +152,10 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute jsonObject.put("action", "read"); jsonObject.put("title", " " + "" + boActCoePublish.getString("PROCESS_TITLE") + ""); jsonObject.put("dept", SDK.getORGAPI() - .getDepartmentByUser("10036614").getNo());// SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo() + .getDepartmentByUser(processExecutionContext.getTaskInstance().getTarget()).getNo());// SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo() String target = processExecutionContext.getTaskInstance().getTarget(); target = processExecutionContext.getTaskInstance().getTarget(); - jsonObject.put("user", "10036614"); + jsonObject.put("user", target); // jsonObject.put("user",);//processExecutionContext.getProcessInstance().getCreateUser() jsonObject.put("date", sdf.format(endTime)); jsonObject.put("remark", boActCoePublish.getString("PROCESS_TITLE")); diff --git a/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm b/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm index c0a4fdbd..28ac708e 100644 --- a/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm +++ b/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm @@ -209,6 +209,9 @@ + +提示：为落实公司经营管理纲要要求，建议识别本文件是否存在相关的流程制度，并审评估是否需要优化整合，以实现流程制度的简洁高效。 + @@ -217,7 +220,7 @@
-
业务归属
+
业务归属     
@@ -265,7 +268,7 @@
-
流程/制度发布通知
+
流程/制度发布通知 
@@ -2084,6 +2087,24 @@ var 下一页 = "下一页"; var 上一页 = "上一页"; var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条"; // ]]> + + +