Skip to content

B
business-java
Commit c401c149 authored by sanashaikh's avatar sanashaikh
Browse files
Options

Sana S: Modified on 25/10/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@210599 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7f95ebb9
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 38 deletions
webitm-adm/src/ibase/webitm/ejb/adm/GradeWisePerkIC.java
View file @ c401c149
......@@ -172,9 +172,9 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else if(mval.equalsIgnoreCase(mval1))
else if(mval==mval1)
{
sql="select payable from allwdedn where ad_code=?";
sql="select payable as mtype from allwdedn where ad_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval);
......@@ -182,7 +182,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
if (rs.next())
{
mtype = rs.getString("payable");
mtype = rs.getString("mtype");
}
if (rs != null)
{
......@@ -195,7 +195,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
pstmt = null;
}
if(!"P".equals(mtype))
if(!mtype.equals("P"))
{
errCode="VTADTYP";
errList.add(errCode);
......@@ -203,7 +203,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
}
if(errCode==null || errCode.trim().length()==0)
if(errCode.equals("") || errCode.trim().length()==0)
{
loginCode=genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -253,10 +253,10 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
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);
......@@ -264,7 +264,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
if (rs.next())
{
cnt=rs.getInt("cnt");
cnt=rs.getInt("count");
}
if (rs != null)
{
......@@ -313,7 +313,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
if(cnt==0)
{
errCode="VMADC1";
errCode="VMADC6";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
......@@ -341,12 +341,12 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
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);
......@@ -357,8 +357,8 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
{
mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
cycleStart=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_start", dom)));
if(mval.equalsIgnoreCase(mval1))
cycleStart=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_start", dom)));
if(mval.equals(mval1))
{
if(cycleStart < 0 || cycleStart > 12 || cycleStart == 0)
{
......@@ -372,8 +372,8 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
{
mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
cycleEnd=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_end", dom)));
if(mval.equalsIgnoreCase(mval1))
cycleEnd=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_end", dom)));
if(mval.equals(mval1))
{
if(cycleEnd < 0 || cycleEnd > 12 || cycleEnd == 0)
{
......@@ -386,7 +386,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
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);
......@@ -395,8 +395,11 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
else if ("amount".equalsIgnoreCase(childNodeName))
{
amount = Double.parseDouble(checkInt(genericUtility.getColumnValue("amount",dom)));
if(amount <= 0)
amount = Double.parseDouble(genericUtility.getColumnValue("amount",dom));
if(genericUtility.getColumnValue("amount",dom) == null || amount >= 0)
{
}
else
{
errCode="VTPAMT1";
errList.add(errCode);
......@@ -413,6 +416,45 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
errFields.add(childNodeName.toLowerCase());
}
}
////added by sana s on 24/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 gradeCode=checkNull(genericUtility.getColumnValue("grade_code",dom));
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
sql="select count(1) as cnt from grade_perk where ad_code= ? and ad_code__main=? and pay_table = ? and grade_code= ? and eff_date = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval1);
pstmt.setString(2, mval);
pstmt.setString(3, payTable);
pstmt.setString(4, gradeCode);
pstmt.setString(5, effDateStr);
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 24/10/19 [end]
}
break;
}
......@@ -516,12 +558,12 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
valueXmlString = itemChanged(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
} catch (Exception e) {
System.out.println("Exception :CadreWisePerkIC :itemChanged(String,String):" + e.getMessage() + ":");
System.out.println("Exception :GradeWisePerkIC :itemChanged(String,String):" + e.getMessage() + ":");
valueXmlString = genericUtility.createErrorString(e);
e.printStackTrace();
throw new ITMException(e);
}
System.out.println("returning from CadreWisePerkIC itemChanged");
System.out.println("returning from GradeWisePerkIC itemChanged");
return valueXmlString;
}
......@@ -602,14 +644,14 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
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)
{
......@@ -628,27 +670,44 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
{
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
System.out.println("lastProcFor"+lastProcFor);
proccFor=sdf.parse(lastProcFor);
System.out.println("proccFor"+proccFor);
cycleTime=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_time", dom)));
//Modified by Sana S on 25/10/19
if(!lastProcFor.equals(null))
{
proccFor=sdf.parse(lastProcFor);
System.out.println("proccFor"+proccFor);
cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1=sdf.format(nextProcDate);
System.out.println("Date ::::"+nextProcDate1);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
nextProcDate1=sdf.format(nextProcDate);
System.out.println("Date ::::"+nextProcDate1);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
}
else
{
valueXmlString.append("<next_proc_date><![CDATA[").append("").append("]]></next_proc_date>\r\n");
}
}
else if ("cycle_time".equalsIgnoreCase(currentColumn))
{
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
proccFor=sdf.parse(lastProcFor);
cycleTime=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1 =sdf.format(nextProcDate);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
if (!lastProcFor.equals(null))
{
proccFor = sdf.parse(lastProcFor);
cycleTime = Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate = utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1 = sdf.format(nextProcDate);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1)
.append("]]></next_proc_date>\r\n");
}
else
{
valueXmlString.append("<next_proc_date><![CDATA[").append("")
.append("]]></next_proc_date>\r\n");
}
}
}
valueXmlString.append("</Detail1>");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment