From 7544f72a8711024af870ef3f4c05e0c3fd215953 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 22 May 2023 10:53:41 +0800
Subject: [PATCH] =?UTF-8?q?L4=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90\?=
=?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../obj_a53d2f8a27f249859f4c04619c9cbb9d.xml | 4 +-
...obj_a53d2f8a27f249859f4c04619c9cbb9d_1.xml | 4 +-
...obj_a53d2f8a27f249859f4c04619c9cbb9d_2.xml | 4 +-
...obj_a53d2f8a27f249859f4c04619c9cbb9d_3.xml | 6 +--
...obj_a53d2f8a27f249859f4c04619c9cbb9d_4.xml | 38 ++++++++--------
...obj_a53d2f8a27f249859f4c04619c9cbb9d_5.xml | 37 +++++++++-------
...obj_a53d2f8a27f249859f4c04619c9cbb9d_6.xml | 44 +++++++++++++------
...obj_a53d2f8a27f249859f4c04619c9cbb9d_7.xml | 37 ++++++++++------
...obj_a53d2f8a27f249859f4c04619c9cbb9d_8.xml | 2 +-
.../client/util/ProcesNumberUtil.java | 29 +++++++++---
.../pal/publisher/event/SubFormAfterSave.java | 4 +-
.../pubEvent/ProcessEndAfterEvent_new.java | 29 +++++++-----
.../js/coe.pal.process.publish.multiple.js | 5 +--
13 files changed, 149 insertions(+), 94 deletions(-)
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d.xml
index 2a1937a7..80583d0d 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2023-05-19 15:15:48
+ 2023-05-22 10:49:49
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -28,7 +28,7 @@
-
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_1.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_1.xml
index 6f3e12e3..ea6d55b5 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_1.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_1.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2023-05-19 15:15:10
+ 2023-05-19 16:08:40
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -28,7 +28,7 @@
-
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_2.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_2.xml
index d72e1b60..2a1937a7 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_2.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_2.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2023-05-19 13:58:39
+ 2023-05-19 15:15:48
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -52,7 +52,7 @@
-
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_3.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_3.xml
index bd78e442..6f3e12e3 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_3.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_3.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2023-05-18 14:01:31
+ 2023-05-19 15:15:10
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -52,7 +52,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_4.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_4.xml
index 54f4c620..d72e1b60 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_4.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_4.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2023-05-18 14:01:06
+ 2023-05-19 13:58:39
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -63,24 +63,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_5.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_5.xml
index d0df65d6..bd78e442 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_5.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_5.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2023-04-03 15:47:08
+ 2023-05-18 14:01:31
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -35,9 +35,11 @@
+
+
@@ -61,20 +63,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_6.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_6.xml
index 734d6621..54f4c620 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_6.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_6.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2022-08-30 13:34:53
+ 2023-05-18 14:01:06
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -23,41 +23,52 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
@@ -66,6 +77,11 @@
+
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_7.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_7.xml
index 8ef93355..d0df65d6 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_7.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_7.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2022-08-29 17:29:40
+ 2023-04-03 15:47:08
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
@@ -23,41 +23,50 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
diff --git a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_8.xml b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_8.xml
index 797497d2..734d6621 100644
--- a/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_8.xml
+++ b/com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d_8.xml
@@ -4,7 +4,7 @@
admin
2022-07-12 14:52:40
admin
- 2022-08-29 16:24:10
+ 2022-08-30 13:34:53
tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv
false
1.0
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 2e294b59..e6784cd3 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
@@ -169,17 +169,19 @@ public class ProcesNumberUtil {
// 查询出主表数据
BO mainData = SDK.getBOAPI().getByProcess("BO_ACT_COE_PUBLISH", bindId);
// 根据主表数据查询出权限的编码
- String qxSql = "select * from BO_ACT_AUTH_INFO where ORGNAME='%s' and LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s'"
+ String qxSql = "select * from BO_ACT_AUTH_INFO where ORGNAME='%s' and LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s' "
+ " and ADAPT_REGION_NAME = '%s' and APPLICABLE_PRODUCT='%s'";
RowMap authData = DBSql.getMap(String.format(qxSql, mainData.getString("ADAPT_NAME_THE_COMPANY"),
mainData.getString("LEVEL_1_PROCESS_NAME"), mainData.getString("LEVEL_2_PROCESS_NAME"),
- mainData.getString("LEVEL_3_PROCESS_NAME"), mainData.getString("ADAPT_REGION_NAME"),
+ mainData.getString("LEVEL_3_PROCESS_NAME"),mainData.getString("LEVEL_4_PROCESS_NAME"),
+ mainData.getString("ADAPT_REGION_NAME"),
mainData.getString("APPLICABLE_PRODUCT")));
// 获取所有的流程编码 如果为空则为00
String orgCode = authData.getString("ORGCODE");
String levelOne = authData.getString("LEVEL_1_PROCESS_ID");
String levelTwo = authData.getString("LEVEL_2_PROCESS_ID");
String levelThree = authData.getString("LEVEL_3_PROCESS_ID");
+ String levelFour = authData.getString("LEVEL_4_PROCESS_ID");
String regionCode = authData.getString("ADAPT_REGION_CODE");
String productCode = authData.getString("APPLICABLE_PRODUCT_CODE");
// 依次生成编号~并回填 修改
@@ -193,7 +195,13 @@ public class ProcesNumberUtil {
} else {
levelThree = "00";
}
- String levelnum = levelOne + "." + levelTwo + "." + levelThree;
+ if (UtilString.isNotEmpty(levelFour)) {
+ levelFour = levelFour.substring(levelFour.lastIndexOf(".") + 1, levelFour.length());
+ } else {
+ levelFour = "00";
+ }
+
+ 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='"
@@ -242,17 +250,19 @@ public class ProcesNumberUtil {
// 查询出主表数据
BO mainData = SDK.getBOAPI().getByProcess("BO_ACT_COE_PUBLISH", bindId);
// 根据主表数据查询出权限的编码
- String qxSql = "select * from BO_ACT_AUTH_INFO where ORGNAME='%s' and LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s'"
+ String qxSql = "select * from BO_ACT_AUTH_INFO where ORGNAME='%s' and LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s'"
+ " and ADAPT_REGION_NAME = '%s' and APPLICABLE_PRODUCT='%s'";
RowMap authData = DBSql.getMap(String.format(qxSql, mainData.getString("ADAPT_NAME_THE_COMPANY"),
mainData.getString("LEVEL_1_PROCESS_NAME"), mainData.getString("LEVEL_2_PROCESS_NAME"),
- mainData.getString("LEVEL_3_PROCESS_NAME"), mainData.getString("ADAPT_REGION_NAME"),
+ mainData.getString("LEVEL_3_PROCESS_NAME"), mainData.getString("LEVEL_4_PROCESS_NAME"),
+ mainData.getString("ADAPT_REGION_NAME"),
mainData.getString("APPLICABLE_PRODUCT")));
// 获取所有的流程编码 如果为空则为00
String orgCode = authData.getString("ORGCODE");
String levelOne = authData.getString("LEVEL_1_PROCESS_ID");
String levelTwo = authData.getString("LEVEL_2_PROCESS_ID");
String levelThree = authData.getString("LEVEL_3_PROCESS_ID");
+ String levelFour=authData.getString("LEVEL_4_PROCESS_ID");
String regionCode = authData.getString("ADAPT_REGION_CODE");
String productCode = authData.getString("APPLICABLE_PRODUCT_CODE");
@@ -267,7 +277,14 @@ public class ProcesNumberUtil {
} else {
levelThree = "00";
}
- String levelnum = levelOne + "." + levelTwo + "." + levelThree;
+
+ if (UtilString.isNotEmpty(levelFour)) {
+ levelFour = levelFour.substring(levelFour.lastIndexOf(".") + 1, levelFour.length());
+ } else {
+ levelFour = "00";
+ }
+
+ 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/event/SubFormAfterSave.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java
index c09a33ca..3adcf5cc 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java
@@ -142,8 +142,8 @@ public class SubFormAfterSave extends ExecuteListener {
/*
根据L1、L2、L3查询权限矩阵所属分部数据
*/
- String sql = "SELECT SSFB FROM BO_ACT_AUTH_INFO WHERE LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND ORGNAME=? AND ADAPT_REGION_NAME=? AND APPLICABLE_PRODUCT=?";
- String ssfb = DBSql.getString(sql, new Object[] { formData.getString("LEVEL_1_PROCESS_NAME"),formData.getString("LEVEL_2_PROCESS_NAME"),formData.getString("LEVEL_3_PROCESS_NAME"),formData.getString("ADAPT_NAME_THE_COMPANY"),formData.getString("ADAPT_REGION_NAME"),formData.getString("APPLICABLE_PRODUCT") });
+ String sql = "SELECT SSFB FROM BO_ACT_AUTH_INFO WHERE LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? AND ORGNAME=? AND ADAPT_REGION_NAME=? AND APPLICABLE_PRODUCT=?";
+ String ssfb = DBSql.getString(sql, new Object[] { formData.getString("LEVEL_1_PROCESS_NAME"),formData.getString("LEVEL_2_PROCESS_NAME"),formData.getString("LEVEL_3_PROCESS_NAME"),formData.getString("LEVEL_4_PROCESS_NAME"),formData.getString("ADAPT_NAME_THE_COMPANY"),formData.getString("ADAPT_REGION_NAME"),formData.getString("APPLICABLE_PRODUCT") });
if(StringUtils.isNotEmpty(ssfb)){
int r1 = DBSql.update("UPDATE BO_ACT_COE_PUBLISH SET SSFB='" + ssfb + "'WHERE BINDID ='" + processInstId + "'");
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 f2ad6a2c..55eb99f7 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
@@ -78,18 +78,25 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute
@Override
public void execute(ProcessExecutionContext ext) throws Exception {
- ExecutorService service = Executors.newFixedThreadPool(1);
- service.execute(new Runnable() {
- @Override
- public void run() {
- try {
- ProcessData(ext);
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+
+ //用户点击确认发布按钮后进行触发推送任务
+ Boolean isConfirmRelease = SDK.getTaskAPI().isChoiceActionMenu(ext.getTaskInstance(), "确认发布");
+ if(isConfirmRelease==true){
+ ExecutorService service = Executors.newFixedThreadPool(1);
+ service.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ ProcessData(ext);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
- }
- });
+ });
+ }
+
+
}
public void ProcessData(ProcessExecutionContext processExecutionContext) throws Exception {
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 6adc78a1..369d3dde 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
@@ -456,7 +456,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',
@@ -570,7 +570,7 @@ function showlist(data, type, pageNumber, start){
var upName = json.upFileName;
var openUrl = json.openUrl;
var downUrl = json.downUrl;
- fName += '' + upName+"xxxx" + ' ';
+ fName += '' + upName + ' ';
}
}
var fileName = curr.publishFileName + ' V' + curr.fileVersion;
@@ -627,7 +627,6 @@ function showlist(data, type, pageNumber, start){
var fName = '';
var upFileId = curr.upfileId;
var changNumer = '提交后生成文件编号';
- debugger;
if(curr.changedNumber != undefined&&curr.changedNumber != ''){
changNumer = curr.changedNumber;
}