From be4c1cc53b5a365e28d1c8819a155c085459a158 Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Mon, 28 Nov 2022 17:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E4=BB=A3=E7=A0=81=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/PublishExecuteListenerInterfaceImpl.java | 6 +++--- .../publisher/event/PublishFormBeforeSaveEvent.java | 11 +++-------- 2 files changed, 6 insertions(+), 11 deletions(-) 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 e6e9e519..08375e71 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 @@ -800,7 +800,7 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme String getid1 = attributesJsonArray.getJSONObject(c).getString("id"); String value1 = attributesJsonArray.getJSONObject(c).getString("value"); if (getid1.equals("Process_performance_indicator_Number")) { - if (UtilString.isEmpty(value1) || !value1.contains("MA")) { + if (UtilString.isEmpty(value1) || !value1.contains("MP")) { insertFlag = true; } } @@ -833,9 +833,9 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme } currentnumber++; - attributesJsonArray.getJSONObject(i).put("value", "MA." + before + after + "." + currentnumber); + attributesJsonArray.getJSONObject(i).put("value", "MP." + before + after + "." + currentnumber); - recordBO.set("PROCESS_PERFORMANCE_IND_NUM", "MA." + before + after + "." + currentnumber); + recordBO.set("PROCESS_PERFORMANCE_IND_NUM", "MP." + before + after + "." + currentnumber); if (performanceNumberBO != null) { diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java index 83090c46..a4a09237 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java @@ -132,9 +132,7 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int boolean publish = onemodel.isPublish(); //如果状态是未发布 if (isUse == true && publish == false) { - if(onemodel.getMethodId().equals("data.form")) { fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId()); - } RowMap publishNrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_N T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.PUBLISHFILEID=T2.ID WHERE T1.BINDID=? AND T1.PUBLISHFILEID=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[i]); @@ -156,10 +154,8 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int if(isUseV==true && isPublishV==false) { - if(onemodel.getMethodId().equals("data.form")) { - fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId()); + fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId()); - } RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]); @@ -181,9 +177,8 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int boolean isPublishV=versions.get(k).isPublish(); if(isUseV==true && isPublishV==false) { - if(onemodel.getMethodId().equals("data.form")) { - fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId()); - } + + fileElements = CoeDesignerUtil.getShapeMessageJson4(onemodel.getId()); RowMap publishCrowMap = DBSql.getMap("SELECT T1.* FROM BO_ACT_COE_PUBLISH_C T1 LEFT JOIN APP_ACT_COE_PAL_REPOSITORY T2 on T1.CHANGEDFILEIDNEW=T2.ID WHERE T1.BINDID=? AND T1.CHANGEDFILEIDNEW=? AND T2.ISPUBLISH=0", bindid, splitRelationFileId[0]);