Commit 614355a5 authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 18/11/19

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212193 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3e212041
......@@ -99,7 +99,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
{
genericUtility = new E12GenericUtility();
itmDbAcess = new ITMDBAccessEJB();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//modified by Sana S on 12/11/19 [start]
//SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy");
//modified by Sana S on 12/11/19 [end]
conn = getConnection();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -168,11 +171,62 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
}
if(cnt == 0)
{
errCode="VMADC1";
/*errCode="VMADC1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMADC1" , userId, "", conn);
return errString;
}
else
{
////added by sana s on 24/10/19 [start]
mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",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 = ?";
sql="select count(1) as cnt from employee_perk where emp_code= ? and ad_code= ? and ad_code__main=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode);
pstmt.setString(2, mval);
pstmt.setString(3, mval1);
//pstmt.setString(4, effDateStr);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
else if(mval.equalsIgnoreCase(mval1))
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt > 0 && "A".equalsIgnoreCase(editFlag))
{
/*errCode="VTDUPREC";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDUPREC" , userId, "", conn);
return errString;
}
////////added by sana s on 24/10/19 [end]
mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
if(mval.equals(mval1))
{
sql="select payable as mtype from allwdedn where ad_code=?";
......@@ -195,11 +249,15 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
pstmt = null;
}
if(!"P".equalsIgnoreCase(mtype))
if( !"P".equalsIgnoreCase(mtype) )
{
errCode="VTADTYP";
/*errCode="VTADTYP";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn);
return errString;
}
}
}
......@@ -278,14 +336,51 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
if(cnt==0)
{
errCode="VEADN1";
/*errCode="VEADN1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VEADN1" , userId, "", conn);
return errString;
}
}
}
}
//Added by Sana S for Emp code validation on 24/10/19 [start]
else if ("emp_code".equalsIgnoreCase(childNodeName))
{
String empCode=checkNull(genericUtility.getColumnValue("emp_code",dom));
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());*/
errString = itmDbAcess.getErrorString("", "VTINVEMP0" , userId, "", conn);
return errString;
}
}
//Added by Sana S for Emp code validation on 24/10/19 [end]
else if ("ad_code__main".equalsIgnoreCase(childNodeName))
{
mval = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
......@@ -312,9 +407,12 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
}
if(cnt==0)
{
errCode="VMADC6";
/*errCode="VMADC6";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMADC6" , userId, "", conn);
return errString;
}
}
......@@ -327,9 +425,12 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
{
if(cycleStart < 0 || cycleStart > 12 || genericUtility.getColumnValue("cycle_start",dom)== null)
{
errCode="VMCYCLE1";
/*errCode="VMCYCLE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
}
}
}
......@@ -342,9 +443,12 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
{
if(cycleEnd < 0 || cycleEnd > 12 || genericUtility.getColumnValue("cycle_end",dom)== null)
{
errCode="VMCYCLE1";
/*errCode="VMCYCLE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
}
}
}
......@@ -353,9 +457,12 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
if(effDateStr == null || effDateStr.trim().length() == 0)
{
errCode="VTDATE11";
/*errCode="VTDATE11";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDATE11" , userId, "", conn);
return errString;
}
}
else if ("exp_date".equalsIgnoreCase(childNodeName))
......@@ -363,43 +470,61 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
expDateStr = checkNull(genericUtility.getColumnValue("exp_date",dom));
Date effDate = sdf.parse( effDateStr );
Date expDate = sdf.parse( expDateStr );
if(expDateStr == null || expDateStr.trim().length() == 0)
if(expDateStr == null || expDateStr.length() == 0)
{
errCode="VTDATE22";
/*errCode="VTDATE22";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDATE22" , userId, "", conn);
return errString;
}
else
{
Date effDate = sdf.parse( effDateStr );
Date expDate = sdf.parse( expDateStr );
// if(expDate.compareTo(effDate) < 0)
//if(expDate.compareTo(effDate) < 0)
if(effDate.after(expDate))
{
errCode="VMEXPDATE";
/*errCode="VMEXPDATE";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMEXPDATE" , userId, "", conn);
return errString;
}
}
}
else if ("validity_period".equalsIgnoreCase(childNodeName))
{
validityPrd = Integer.parseInt(checkInt(genericUtility.getColumnValue("validity_period",dom)));
if(validityPrd <= 0)
{
errCode="VTVALPRD";
/*errCode="VTVALPRD";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTVALPRD" , userId, "", conn);
return errString;
}
}
else if ("amount".equalsIgnoreCase(childNodeName))
{
amount = Double.parseDouble(checkInt(genericUtility.getColumnValue("amount",dom)));
if(amount <= 0)
if(amount >= 0)
{
}
else
{
errCode="VTPAMT1";
/*errCode="VTPAMT1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTPAMT1" , userId, "", conn);
return errString;
}
}
else if ("cycle_time".equalsIgnoreCase(childNodeName))
......@@ -408,79 +533,19 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
if(genericUtility.getColumnValue("cycle_time",dom) == null || cycleTime <= 0)
{
errCode="VMCYCLE1";
errList.add(errCode);
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";
/*errCode="VMCYCLE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
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;
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
}
if(cnt==0)
{
errCode="VTINVEMP0";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
////////added by sana s on 24/10/19 [end]
}
break;
}
}
System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
/*System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
if (errList != null && errList.size() > 0)
{
System.out.println("errList==[" + errList + "]");
......@@ -513,7 +578,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
errFields.clear();
}
errStringXml.append("</Errors></Root>\r\n");
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());*/
}
catch (Exception e)
{
......@@ -547,7 +612,7 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
throw new ITMException(e);
}
}
errString = errStringXml.toString();
//errString = errStringXml.toString();
return errString;
}
......@@ -604,17 +669,19 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
String sql = "";
String descr = "";
String empCode = "";
String paySite="";
String paySite="",lastProcDate="";
AdmCommon admCommon = new AdmCommon();
String lastProcFor="";
int cycleTime = 0;
Date proccFor=null,nextProcDate=null;
String nextProcDate1=null;
UtilMethods utilMethods=new UtilMethods();
SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yy");
try
{
//SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yy");
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
genericUtility = new E12GenericUtility();
System.out.println("currentFormNo...." + currentFormNo);
conn = getConnection();
......@@ -682,6 +749,19 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
AdmCommon.setNodeValue(dom, "exp_date", adExpDate);
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)));
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]
}
else if ("ad_code".equalsIgnoreCase(currentColumn))
{
......@@ -710,9 +790,15 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
}
else if ("last_proc_for".equalsIgnoreCase(currentColumn))
{
lastProcFor="";
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
System.out.println("lastProcFor"+lastProcFor);
if (!lastProcFor.equals(null))
System.out.println("lastProcFor"+lastProcFor.length());
if ((lastProcFor.equals(null)) || (lastProcFor.equals("")) || lastProcFor.length() == 0 )
{
valueXmlString.append("<next_proc_date><![CDATA[").append("")
.append("]]></next_proc_date>\r\n");
}
else
{
proccFor = sdf.parse(lastProcFor);
System.out.println("proccFor" + proccFor);
......@@ -723,11 +809,6 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
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))
{
......
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