From 5ae7cf4db8baf344521ef62243041aaa0172cfe8 Mon Sep 17 00:00:00 2001
From: zhangjun <zhangjun@DESKTOP-BF9USEF>
Date: Thu, 22 Aug 2019 09:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8A=A9=E7=90=86?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8C=E6=8A=8A=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/amarsoft/app/flow/FlowAction.java     |  2 +-
 .../com/tenwa/flow/task/TenwaFlowTask.java    | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java
index 4fd1a0f9a..5ef5bcbe8 100644
--- a/src/com/amarsoft/app/flow/FlowAction.java
+++ b/src/com/amarsoft/app/flow/FlowAction.java
@@ -1593,7 +1593,7 @@ public class FlowAction {
 			if (null == operatorNunber || operatorNunber.length() == 0) {
 				operatorNunber = "1";
 			}
-			configNumber = Integer.valueOf("operatorNunber");
+			configNumber = Integer.valueOf(operatorNunber);
 			if ((commited + 1) == configNumber) {
 				return "Yes";
 			} else {
diff --git a/src_core/com/tenwa/flow/task/TenwaFlowTask.java b/src_core/com/tenwa/flow/task/TenwaFlowTask.java
index b2fd9785e..d06e0435b 100644
--- a/src_core/com/tenwa/flow/task/TenwaFlowTask.java
+++ b/src_core/com/tenwa/flow/task/TenwaFlowTask.java
@@ -35,7 +35,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * »ñµÃÁ÷³ÌÏÂÒ»²½ÐÅÏ¢
+	 * ���������һ����Ϣ
 	 * 
 	 * @return
 	 * @throws Exception
@@ -193,7 +193,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * »ñµÃ½ÚµãÆäËûÅäÖÃÐÅÏ¢
+	 * ��ýڵ�����������Ϣ
 	 * 
 	 * @param phaseNo
 	 * @return
@@ -224,7 +224,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * µ±Ç°²¢ÐÐÁ÷³ÌµÄ¸öÊý
+	 * ��ǰ�������̵ĸ���
 	 * 
 	 * @return
 	 * @throws Exception
@@ -248,7 +248,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * »ñµÃÖ¸¶¨½ÚµãÉϵĴ¦ÀíÈË»ò´«ÔÄÈËÔ±
+	 * ���ָ���ڵ��ϵĴ����˻�����Ա
 	 * 
 	 * @param phaseNo
 	 * @param Otype
@@ -290,7 +290,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * Ö´Ðй«Ê½½Å±¾
+	 * ִ�й�ʽ�ű�
 	 * 
 	 * @param strScript
 	 * @param scriptMap
@@ -314,7 +314,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * »ñµÃ²½ÖèºÅºÍ²½ÖèÃû³Æ
+	 * ��ò���źͲ�������
 	 * 
 	 * @param stempInfo
 	 * @return
@@ -329,7 +329,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * Åжϵ±Ç°´¦ÀíÈËÊDz»ÊǶàÈËÖÐ×îºóÒ»ÏÂ
+	 * �жϵ�ǰ�������Dz��Ƕ��������һ��
 	 * 
 	 * @return
 	 * @throws Exception
@@ -358,7 +358,7 @@ public class TenwaFlowTask extends FlowTask {
 						ft.getAttribute("relativeSerialNo").getString())
 				.getSingleResult(false);
 		int allTaskNum = allTaskNumBo.getAttribute("allTaskNum").getInt();
-		// ÒÑÌá½»µÄÈÎÎñÊý
+		// ���ύ��������
 		BizObject commitedTaskNumBo = ftManager
 				.createQuery(
 						" select count(1) as v.commited from O where relativeSerialNo=:relativeSerialNo and phaseNo<>'5000' and endTime is not null and length(endTime)>0 ")
@@ -379,7 +379,7 @@ public class TenwaFlowTask extends FlowTask {
 			if (null == operatorNunber || operatorNunber.length() == 0) {
 				operatorNunber = "1";
 			}
-			configNumber = Integer.valueOf("operatorNunber");
+			configNumber = Integer.valueOf(operatorNunber);
 			if ((commited + 1) == configNumber) {
 				return "Yes";
 			} else {
@@ -392,7 +392,7 @@ public class TenwaFlowTask extends FlowTask {
 	}
 
 	/**
-	 * »ñµÃÁ÷³ÌÍË»ØÐÅÏ¢
+	 * ��������˻���Ϣ
 	 * 
 	 * @return
 	 * @throws Exception
@@ -433,7 +433,7 @@ public class TenwaFlowTask extends FlowTask {
 				.createQuery(sql).setParameter("flowno", this.FlowNo)
 				.getResultList(false);
 		if (backSteps.length() == 0) {
-			// ¼ÓÔØÍË»ØÉÏÒ»²½
+			// �����˻���һ��
 			returnMessage += "{\"phaseNo\":\""
 					+ bos.get(0).getAttribute("phaseno").getString()
 					+ "\",\"phaseName\":\""
@@ -464,7 +464,7 @@ public class TenwaFlowTask extends FlowTask {
 
 	}
 	/**
-	 * »ñµÃÁ÷³ÌÍË»ØÐÅÏ¢
+	 * ��������˻���Ϣ
 	 * 
 	 * @return
 	 * @throws Exception