From 7b8563cc99e65a4490ce6404d8465eb9db713d67 Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Tue, 26 Jul 2022 01:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/coe/pal/publisher/client/util/ProcesNumberUtil.java | 5 +++--
 .../apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java | 4 ++++
 .../event/PublishExecuteListenerInterfaceCreateNo.java       | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

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 d070f3e5..126772ae 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
@@ -95,16 +95,17 @@ public class ProcesNumberUtil {
             String name = "00R00";
             if(rowMap!=null){
                 String plcategory=rowMap.getString("PLCATEGORY");
+                System.out.println("plcategory"+plcategory);
                 if(plcategory.equals("process")){
                     name = number + "/P"+number;
                 }else if(plcategory.equals("control")){
                     name = "00/R00";
                 }else if(plcategory.equals("data")){
-                    name = "00/R00";
+                    name = "00/T00";
                 }
             }
 
-            String processNum = levelnum + "." + name + orgCode + regionCode + productCode;
+            String processNum = levelnum + "." + name +"V1.0"+orgCode + regionCode + productCode;
             DBSql.update(String.format(updateSql, processNum, nowData.getId()));
             String publishFileId = nowData.getString("PUBLISHFILEID");
             String updateAttrsql = "update APP_ACT_COE_PAL_PROP set PROPERTYVALUE='%s' where PROPERTYID='%s' AND PLID='%s'";
diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java
index d952ce81..47543c55 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java
@@ -1,5 +1,6 @@
 package com.actionsoft.apps.coe.pal.publisher.event;
 
+import com.actionsoft.apps.coe.pal.publisher.client.util.ProcesNumberUtil;
 import com.actionsoft.apps.coe.pal.publisher.client.util.ProcessStatusAPIManager;
 import com.actionsoft.bpms.bpmn.engine.core.delegate.ProcessExecutionContext;
 import com.actionsoft.bpms.bpmn.engine.listener.ExecuteListener;
@@ -15,6 +16,9 @@ public class ApplyTasAfterkComplete extends ExecuteListener implements ExecuteLi
 
     @Override
     public void execute(ProcessExecutionContext ctx) throws Exception {
+        String processInstId = ctx.getProcessInstance().getId();
+        //by bzp 文件编号生成
+        new ProcesNumberUtil().getNumber(processInstId);
         SDK.getLogAPI().consoleInfo("[任务事件]任务结束，涉及流程状态变为审批中-->" + ctx.getTaskInstance().getTitle());
         ProcessStatusAPIManager.getInstance().batchUpdateApprovalStatus(ctx.getTaskInstance().getProcessInstId(), true);
     }
diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceCreateNo.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceCreateNo.java
index 394cc9f4..2f09d089 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceCreateNo.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceCreateNo.java
@@ -36,7 +36,7 @@ public class PublishExecuteListenerInterfaceCreateNo extends ExecuteListener imp
 
 	@Override
 	public void execute(ProcessExecutionContext param) throws Exception {
-		PublishHistoryModel model = new PublishHistoryModel();
+		System.out.println("任务完成后生成文件编号===============");
 		String processInstId = param.getProcessInstance().getId();
 		//by bzp 测试编号生成
 		new ProcesNumberUtil().getNumber(processInstId);