added instance id filter in query

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98386 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/PAMDActivityStatus.java

@@ -34,6 +34,10 @@ public class PAMDActivityStatus
 			String prvActivityId = "";
 			boolean flag = true;
 			
+			processInfo = processId.split(":");
+			prvActivityId = processInfo[2];
+			System.out.println("prvActivityId["+prvActivityId+"],activityId["+activityId+"]");
+			
 			if("CHKUSRCOND".equalsIgnoreCase(keyFlag))
 			{
 				ArrayList<String> list = new ArrayList<String>();
@@ -47,20 +51,17 @@ public class PAMDActivityStatus
 				list.add("P-AMD_ON_REL_ISER_SV");
 				list.add("P-AMD_ON_REL_ISER_SD");
 
-				processInfo = processId.split(":");
-				prvActivityId = processInfo[2];
-				System.out.println("prvActivityId["+prvActivityId+"],activityId["+activityId+"]");
-				
 				sql = "select previous_activity, seq_id "
 						+"from wf_prc_status "
 						+"where ltrim(rtrim(ref_ser)) = ? and ltrim(rtrim(ref_id)) = ? "
-						+"and activity_id = ? and seq_id = ?";
+						+"and activity_id = ? and seq_id = ? and instance_id = ?";
 						
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, "P-AMD");
 				pstmt.setString(2, tranId);
 				pstmt.setString(3, prvActivityId);
 				pstmt.setString(4, processInfo[3]);
+				pstmt.setString(5, processInfo[1]);
 				rs = pstmt.executeQuery();
 				if (rs.next()) 
 				{
@@ -90,7 +91,7 @@ public class PAMDActivityStatus
 							+"select previous_activity, seq_id "
 							+"from wf_prc_status "
 							+"where ltrim(rtrim(ref_ser)) = ? and ltrim(rtrim(ref_id)) = ? "
-							+"and activity_id = ? and seq_id <> 1 "
+							+"and activity_id = ? and seq_id <> 1 and instance_id = ? "
 							+"order by seq_id desc "
 							+") tab "
 							+"where rownum = 1";
@@ -99,6 +100,7 @@ public class PAMDActivityStatus
 					pstmt.setString(1, "P-AMD");
 					pstmt.setString(2, tranId);
 					pstmt.setString(3, prvActivityId);
+					pstmt.setString(4, processInfo[1]);
 					rs = pstmt.executeQuery();
 					if (rs.next()) 
 					{

webitm-dis/ibase/webitm/ejb/dis/POAprvActivityStatus.java

@@ -35,6 +35,10 @@ public class POAprvActivityStatus
 			String prvActivityId = "";
 			boolean flag = true;
 
+			processInfo = processId.split(":");
+			prvActivityId = processInfo[2];
+			System.out.println("prvActivityId["+prvActivityId+"],activityId["+activityId+"]");
+			
 			if("CHKUSRCOND".equalsIgnoreCase(keyFlag))
 			{
 				ArrayList<String> list = new ArrayList<String>();
@@ -48,20 +52,17 @@ public class POAprvActivityStatus
 				list.add("PORD_ON_REL_ISER_SV");
 				list.add("PORD_ON_REL_ISER_SD");
 
-				processInfo = processId.split(":");
-				prvActivityId = processInfo[2];
-				System.out.println("prvActivityId["+prvActivityId+"],activityId["+activityId+"]");
-				
 				sql = "select previous_activity, seq_id "
 						+"from wf_prc_status "
 						+"where ltrim(rtrim(ref_ser)) = ? and ltrim(rtrim(ref_id)) = ? "
-						+"and activity_id = ? and seq_id = ?";
+						+"and activity_id = ? and seq_id = ? and instance_id = ?";
 						
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, "P-ORD");
 				pstmt.setString(2, tranId);
 				pstmt.setString(3, prvActivityId);
 				pstmt.setString(4, processInfo[3]);
+				pstmt.setString(5, processInfo[1]);
 				rs = pstmt.executeQuery();
 				if (rs.next()) 
 				{
@@ -91,7 +92,7 @@ public class POAprvActivityStatus
 							+"select previous_activity, seq_id "
 							+"from wf_prc_status "
 							+"where ltrim(rtrim(ref_ser)) = ? and ltrim(rtrim(ref_id)) = ? "
-							+"and activity_id = ? and seq_id <> 1 "
+							+"and activity_id = ? and seq_id <> 1 and instance_id = ? "
 							+"order by seq_id desc "
 							+") tab "
 							+"where rownum = 1";
@@ -100,6 +101,7 @@ public class POAprvActivityStatus
 					pstmt.setString(1, "P-ORD");
 					pstmt.setString(2, tranId);
 					pstmt.setString(3, prvActivityId);
+					pstmt.setString(4, processInfo[1]);
 					rs = pstmt.executeQuery();
 					if (rs.next()) 
 					{