Commit eb462b70 authored by sanashaikh's avatar sanashaikh

Sana S : Modified on 30/10/19

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@210675 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a788b44a
...@@ -312,7 +312,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -312,7 +312,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
} }
if(cnt==0) if(cnt==0)
{ {
errCode="VMADC1"; errCode="VMADC6";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
...@@ -322,7 +322,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -322,7 +322,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
{ {
mval = checkNull(genericUtility.getColumnValue("ad_code",dom)); mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom)); mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
cycleStart=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_start", dom))); cycleStart=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_start", dom)));
if(mval.equalsIgnoreCase(mval1)) if(mval.equalsIgnoreCase(mval1))
{ {
if(cycleStart < 0 || cycleStart > 12 || genericUtility.getColumnValue("cycle_start",dom)== null) if(cycleStart < 0 || cycleStart > 12 || genericUtility.getColumnValue("cycle_start",dom)== null)
...@@ -337,7 +337,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -337,7 +337,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
{ {
mval = checkNull(genericUtility.getColumnValue("ad_code",dom)); mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom)); mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
cycleEnd=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_end", dom))); cycleEnd=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_end", dom)));
if(mval.equals(mval1)) if(mval.equals(mval1))
{ {
if(cycleEnd < 0 || cycleEnd > 12 || genericUtility.getColumnValue("cycle_end",dom)== null) if(cycleEnd < 0 || cycleEnd > 12 || genericUtility.getColumnValue("cycle_end",dom)== null)
...@@ -368,7 +368,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -368,7 +368,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
if(expDateStr == null || expDateStr.trim().length() == 0) if(expDateStr == null || expDateStr.trim().length() == 0)
{ {
errCode="VTDATE11"; errCode="VTDATE22";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
...@@ -413,6 +413,69 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -413,6 +413,69 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
errFields.add(childNodeName.toLowerCase()); 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 empCode=checkNull(genericUtility.getColumnValue("emp_code",dom));
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
sql="select count(1) as cnt from employee_perk where emp_code= ? and ad_code= ? and ad_code__main=? and eff_date = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, mval1);
pstmt.setString(3, mval);
pstmt.setString(4, 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());
}
sql="select count(1) as cnt from employee where emp_code= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
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==0)
{
errCode="VTINVEMP0";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
////////added by sana s on 24/10/19 [end]
} }
break; break;
} }
...@@ -649,27 +712,40 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -649,27 +712,40 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
{ {
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom)); lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
System.out.println("lastProcFor"+lastProcFor); System.out.println("lastProcFor"+lastProcFor);
proccFor=sdf.parse(lastProcFor); if (!lastProcFor.equals(null))
System.out.println("proccFor"+proccFor); {
proccFor = sdf.parse(lastProcFor);
cycleTime=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_time", dom))); 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);
nextProcDate1=sdf.format(nextProcDate); System.out.println("Date ::::" + nextProcDate1);
System.out.println("Date ::::"+nextProcDate1); valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1)
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n"); .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)) else if ("cycle_time".equalsIgnoreCase(currentColumn))
{ {
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom)); lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
proccFor=sdf.parse(lastProcFor); if (!lastProcFor.equals(null))
{
cycleTime=Integer.parseInt(checkNull(genericUtility.getColumnValue("cycle_time", dom))); proccFor = sdf.parse(lastProcFor);
cycleTime = Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime); nextProcDate = utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1 =sdf.format(nextProcDate); nextProcDate1 = sdf.format(nextProcDate);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n"); 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>"); 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