Sana S: Modified on 23/10/19

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

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

@@ -173,7 +173,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 							}
 							else
 							{
-								if(mval.equalsIgnoreCase(mval1))
+								if(mval==mval1)
 								{
 									sql="select payable as mtype from allwdedn where ad_code=?";
 
@@ -196,7 +196,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 										pstmt = null;
 									}
 
-									if(!"P".equals(mtype))
+									if(!mtype.equals("P"))
 									{
 										errCode="VTADTYP";
 										errList.add(errCode);
@@ -205,7 +205,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 								}
 							}
 
-							if(errCode==null || errCode.trim().length()==0)
+							if(errCode.equals("") || errCode.trim().length()==0)
 							{
 								loginCode=genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 
@@ -254,10 +254,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 									pstmt = null;
 								}
 								System.out.print("ls_accfilt:"+ls_accfilt);
-								if(ls_accfilt!=null && ls_accfilt.trim().length() > 0)
+								if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0)
 								{
 									System.out.print("U R IN");
-									sql="select count(1) as cnt from allwdedn where ad_code = ?  and " + ls_accfilt;
+									sql="select count(1) from allwdedn where ad_code = ?  and " + ls_accfilt;
 
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setString(1, mval);
@@ -265,7 +265,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 
 									if (rs.next())
 									{
-										cnt=rs.getInt("cnt");
+										cnt=rs.getInt("count");
 									}
 									if (rs != null)
 									{
@@ -314,7 +314,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 							}
 							if(cnt==0)
 							{
-								errCode="VMADC1";
+								errCode="VMADC6";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
@@ -373,12 +373,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 
 							if(expDateStr == null || expDateStr.trim().length() == 0)
 							{
-								errCode="VTDATE11";
-								errList.add("VTDATE11");
+								errCode="VTDATE22";
+								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
 
-							if(effDate.after(expDate))
+							if(expDate.compareTo(effDate) < 0)
 							{
 								errCode="VMEXPDATE";
 								errList.add(errCode);
@@ -389,7 +389,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 						else if ("validity_period".equalsIgnoreCase(childNodeName))
 						{
 							validityPrd = Integer.parseInt(checkInt(genericUtility.getColumnValue("validity_period",dom)));
-							if( validityPrd <= 0)
+							if(genericUtility.getColumnValue("validity_period",dom) == null || validityPrd <= 0)
 							{
 								errCode="VTVALPRD";
 								errList.add(errCode);
@@ -400,7 +400,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 						else if ("amount".equalsIgnoreCase(childNodeName))
 						{
 							amount = Double.parseDouble(checkInt(genericUtility.getColumnValue("amount",dom)));
-							if(amount <= 0)
+							if(genericUtility.getColumnValue("amount",dom) == null || amount <= 0)
 							{
 								errCode="VTPAMT1";
 								errList.add(errCode);
@@ -411,13 +411,47 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 						else if ("cycle_time".equalsIgnoreCase(childNodeName))
 						{
 							cycleTime = Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time",dom)));
-							if(genericUtility.getColumnValue("cycle_time",dom) == null || cycleTime <= 0)
+							if(genericUtility.getColumnValue("cycle_time",dom) == null || cycleTime < 0)
 							{
 								errCode="VMCYCLE1";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
 						}
+						////added by sana s on 17/10/19  [start]
+						mval  = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
+						mval1 = checkNull(genericUtility.getColumnValue("ad_code",dom));
+						String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
+						String cadreCode=checkNull(genericUtility.getColumnValue("cadre_code",dom));
+						effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
+						
+						sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ? and eff_date = ?";
+
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, mval);
+						rs = pstmt.executeQuery();
+
+						if (rs.next())
+						{
+							cnt = rs.getInt("cnt");
+						}
+						if (rs != null)
+						{
+							rs.close();
+							rs = null;
+						}
+						if (pstmt != null) 
+						{
+							pstmt.close();
+							pstmt = null;
+						}
+						if(cnt==1)
+						{
+							errCode="VTDUPREC";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+						////////added by sana s on 17/10/19  [end]
 					}
 					break;
 				}
@@ -611,14 +645,14 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 				else if ("ad_code".equalsIgnoreCase(currentColumn)) 
 				{
 					adCode = checkNull(genericUtility.getColumnValue("ad_code", dom));
-					sql = "Select descr from allwdedn where ad_code = ?";
+					sql = "Select descr as mdescr from allwdedn where ad_code = ?";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, adCode);
 					rs = pstmt.executeQuery();
 
 					if (rs.next())
 					{
-						descr = rs.getString("descr");
+						descr = rs.getString("mdescr");
 					}
 					if (rs != null)
 					{
@@ -781,4 +815,4 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 	}
 }
 
-//Created by Sana Shaikh on 06/09/2019  for Cadre Wise Perk  [ends]
+//Created by Sana Shaikh on 09/09/2019  for Cadre Wise Perk  [ends]