Sana S: Modified on 15/11/19

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

webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java

@@ -178,11 +178,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 							else
 							{
 							
-								mval  = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
-								mval1 = checkNull(genericUtility.getColumnValue("ad_code",dom));
+								mval  = checkNull(genericUtility.getColumnValue("ad_code",dom));
+								mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
 								String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
 								String cadreCode=checkNull(genericUtility.getColumnValue("cadre_code",dom));
-								effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
+								//effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
 
 								System.out.print("effDateStr at 433:"+effDateStr);
 
@@ -191,8 +191,8 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 								sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ?";
 
 								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1, mval1);
-								pstmt.setString(2, mval);
+								pstmt.setString(1, mval);
+								pstmt.setString(2, mval1);
 								pstmt.setString(3, payTable);
 								pstmt.setString(4, cadreCode);
 								//pstmt.setString(5, effDateStr);
@@ -223,8 +223,16 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 									return errString;
 								}
 								
-								if(mval==mval1)
+								
+								mval = checkNull(genericUtility.getColumnValue("ad_code", dom));
+								mval1 = checkNull(genericUtility.getColumnValue("ad_code__main", dom));
+								
+								System.out.print("mval::"+mval);
+								System.out.print("mval1::"+mval1);
+								
+								if(mval.equals(mval1))
 								{
+									System.out.print("Mval Checked"+mval==mval1);;
 									sql="select payable as mtype from allwdedn where ad_code=?";
 
 									pstmt = conn.prepareStatement(sql);
@@ -235,6 +243,16 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 									{
 										mtype = rs.getString("mtype");
 									}
+									if("P" != mtype)
+									{
+										System.out.print("mtype::"+mtype);
+										/*errCode="VTADTYP";
+										errList.add(errCode);
+										errFields.add(childNodeName.toLowerCase());*/
+										errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn);
+										return errString;
+									}
+									
 									if (rs != null)
 									{
 										rs.close();
@@ -245,16 +263,9 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 										pstmt.close();
 										pstmt = null;
 									}
-
-									if(!mtype.equals("P"))
-									{
-										/*errCode="VTADTYP";
-										errList.add(errCode);
-										errFields.add(childNodeName.toLowerCase());*/
-										errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn);
-										return errString;
-									}
 								}
+								mval=null;
+								mval1=null;
 							}
 
 							if(errCode.equals("") || errCode.trim().length()==0)
@@ -344,12 +355,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 
 						else if ("ad_code__main".equalsIgnoreCase(childNodeName))
 						{
-							mval = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
+							mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
 
 							sql="select count(1) as cnt from allwdedn where ad_code= ?";
 
 							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, mval);
+							pstmt.setString(1, mval1);
 							rs = pstmt.executeQuery();
 
 							if (rs.next())
@@ -701,12 +712,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 					AdmCommon.setNodeValue(dom, "exp_date", adExpDate1);
 					System.out.println("dom==["+genericUtility.serializeDom(dom)+"]");
 					
-					
+					//Added by Sana S for last process date on 15/11/19 [start]
 					lastProcDate =sdf.format(new Date());
 					valueXmlString.append("<last_proc_for ><![CDATA[").append(lastProcDate).append("]]></last_proc_for>\r\n");
 					AdmCommon.setNodeValue(dom, "last_proc_for", lastProcDate);
 
-					
 					proccFor=sdf.parse(lastProcDate);
 
 					cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
@@ -714,6 +724,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 					nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
 					nextProcDate1 =sdf.format(nextProcDate);
 					valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
+					//Added by Sana S for last process date on 15/11/19 [end]
 					
 					/*valueXmlString.append("<cadre_code  protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
 					valueXmlString.append("<pay_table  protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");*/