Skip to content

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

Sana S: Modified on 14/01/2020 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215099 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9605bdb6
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 27 deletions
webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java
View file @ 83cbd8d3
...@@ -177,7 +177,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -177,7 +177,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
} }
else else
{ {
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));
String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom)); String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
...@@ -187,7 +187,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -187,7 +187,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
System.out.print("effDateStr at 433:"+effDateStr); System.out.print("effDateStr at 433:"+effDateStr);
//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 = ?"; //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 = ?";
sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ?"; 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 = conn.prepareStatement(sql);
...@@ -218,18 +218,18 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -218,18 +218,18 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VTDUPREC"; /*errCode="VTDUPREC";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDUPREC" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VTDUPREC" , userId, "", conn);
return errString; return errString;
} }
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));
System.out.print("mval::"+mval); System.out.print("mval::"+mval);
System.out.print("mval1::"+mval1); System.out.print("mval1::"+mval1);
if(mval.equals(mval1)) if(mval.equals(mval1))
{ {
System.out.print("Mval Checked"+mval==mval1);; System.out.print("Mval Checked"+mval==mval1);;
...@@ -252,7 +252,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -252,7 +252,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn);
return errString; return errString;
} }
if (rs != null) if (rs != null)
{ {
rs.close(); rs.close();
...@@ -304,7 +304,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -304,7 +304,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
if (rs.next()) if (rs.next())
{ {
ls_accfilt = rs.getString("ls_accfilt"); //Modified by Sana S on 14/01/2020 [start]
//ls_accfilt = rs.getString("ls_accfilt");
ls_accfilt = checkNull(rs.getString("ls_accfilt"));
//Modified by Sana S on 14/01/2020 [end]
} }
if (rs != null) if (rs != null)
{ {
...@@ -317,8 +320,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -317,8 +320,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
pstmt = null; pstmt = null;
} }
System.out.print("ls_accfilt:"+ls_accfilt); System.out.print("ls_accfilt:"+ls_accfilt);
//if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0) //Modified by Sana S on 14/01/2020 [start]
if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020 if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0)
//if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020
//Modified by Sana S on 14/01/2020 [end]
{ {
System.out.print("U R IN"); System.out.print("U R IN");
sql="select count(1) from allwdedn where ad_code = ? and " + ls_accfilt; sql="select count(1) from allwdedn where ad_code = ? and " + ls_accfilt;
...@@ -386,7 +391,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -386,7 +391,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
errString = itmDbAcess.getErrorString("", "VMADC6" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VMADC6" , userId, "", conn);
return errString; return errString;
} }
} }
else if ("cycle_start".equalsIgnoreCase(childNodeName)) else if ("cycle_start".equalsIgnoreCase(childNodeName))
...@@ -401,7 +406,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -401,7 +406,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VMCYCLE1"; /*errCode="VMCYCLE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString; return errString;
} }
...@@ -420,7 +425,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -420,7 +425,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VMCYCLE1"; /*errCode="VMCYCLE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString; return errString;
} }
...@@ -436,7 +441,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -436,7 +441,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VTDATE11"; /*errCode="VTDATE11";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDATE11" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VTDATE11" , userId, "", conn);
return errString; return errString;
} }
...@@ -462,13 +467,13 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -462,13 +467,13 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
System.out.println("effDate ::::"+effDate); System.out.println("effDate ::::"+effDate);
System.out.println("expDate ::::"+expDate); System.out.println("expDate ::::"+expDate);
if(expDate.compareTo(effDate) < 0) if(expDate.compareTo(effDate) < 0)
{ {
/*errCode="VMEXPDATE"; /*errCode="VMEXPDATE";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMEXPDATE" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VMEXPDATE" , userId, "", conn);
return errString; return errString;
} }
...@@ -483,7 +488,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -483,7 +488,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VTVALPRD"; /*errCode="VTVALPRD";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTVALPRD" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VTVALPRD" , userId, "", conn);
return errString; return errString;
} }
...@@ -500,7 +505,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -500,7 +505,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VTPAMT1"; /*errCode="VTPAMT1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTPAMT1" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VTPAMT1" , userId, "", conn);
return errString; return errString;
} }
...@@ -514,7 +519,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -514,7 +519,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
/*errCode="VMCYCLE1"; /*errCode="VMCYCLE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/ errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn); errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString; return errString;
} }
...@@ -661,14 +666,18 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -661,14 +666,18 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
SimpleDateFormat sdf; SimpleDateFormat sdf;
//Added by Sana S on 14/01/2020 [start]
String amount="";
//Added by Sana S on 14/01/2020 [end]
try try
{ {
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//sdf = new SimpleDateFormat("dd/MM/yy"); // Modified by Sana S on 08/11/19 //sdf = new SimpleDateFormat("dd/MM/yy"); // Modified by Sana S on 08/11/19
System.out.println("currentFormNo...." + currentFormNo); System.out.println("currentFormNo...." + currentFormNo);
conn = getConnection(); conn = getConnection();
if (objContext != null && objContext.trim().length() > 0) if (objContext != null && objContext.trim().length() > 0)
...@@ -704,18 +713,18 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -704,18 +713,18 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
System.out.println("genericUtility.getApplDateFormat()==["+genericUtility.getApplDateFormat()+"]"); System.out.println("genericUtility.getApplDateFormat()==["+genericUtility.getApplDateFormat()+"]");
adEffDate1 = genericUtility.getValidDateString(adEffDate.trim(),"dd-MM-yy", genericUtility.getApplDateFormat()); adEffDate1 = genericUtility.getValidDateString(adEffDate.trim(),"dd-MM-yy", genericUtility.getApplDateFormat());
System.out.println("lsVarValue==after["+adEffDate1+"]"); System.out.println("lsVarValue==after["+adEffDate1+"]");
adExpDate = admCommon.getEnv("999999", "AD_EXPDATE", conn); adExpDate = admCommon.getEnv("999999", "AD_EXPDATE", conn);
adExpDate1 = genericUtility.getValidDateString(adExpDate.trim(), "dd-MM-yy", genericUtility.getApplDateFormat()); adExpDate1 = genericUtility.getValidDateString(adExpDate.trim(), "dd-MM-yy", genericUtility.getApplDateFormat());
System.out.println("lsVarValue==after["+adExpDate1+"]"); System.out.println("lsVarValue==after["+adExpDate1+"]");
valueXmlString.append("<eff_date ><![CDATA[").append(adEffDate1).append("]]></eff_date>\r\n"); valueXmlString.append("<eff_date ><![CDATA[").append(adEffDate1).append("]]></eff_date>\r\n");
AdmCommon.setNodeValue(dom, "eff_date", adEffDate1); AdmCommon.setNodeValue(dom, "eff_date", adEffDate1);
valueXmlString.append("<exp_date ><![CDATA[").append(adExpDate1).append("]]></exp_date>\r\n"); valueXmlString.append("<exp_date ><![CDATA[").append(adExpDate1).append("]]></exp_date>\r\n");
AdmCommon.setNodeValue(dom, "exp_date", adExpDate1); AdmCommon.setNodeValue(dom, "exp_date", adExpDate1);
System.out.println("dom==["+genericUtility.serializeDom(dom)+"]"); System.out.println("dom==["+genericUtility.serializeDom(dom)+"]");
//Added by Sana S for last process date on 15/11/19 [start] //Added by Sana S for last process date on 15/11/19 [start]
lastProcDate =sdf.format(new Date()); lastProcDate =sdf.format(new Date());
valueXmlString.append("<last_proc_for ><![CDATA[").append(lastProcDate).append("]]></last_proc_for>\r\n"); valueXmlString.append("<last_proc_for ><![CDATA[").append(lastProcDate).append("]]></last_proc_for>\r\n");
...@@ -729,7 +738,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -729,7 +738,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
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");
//Added by Sana S for last process date on 15/11/19 [end] //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("<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");*/ valueXmlString.append("<pay_table protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");*/
} }
...@@ -759,6 +768,19 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -759,6 +768,19 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
valueXmlString.append("<allwdedn_descr ><![CDATA[").append(descr).append("]]></allwdedn_descr>\r\n"); valueXmlString.append("<allwdedn_descr ><![CDATA[").append(descr).append("]]></allwdedn_descr>\r\n");
AdmCommon.setNodeValue(dom, "allwdedn_descr", descr); AdmCommon.setNodeValue(dom, "allwdedn_descr", descr);
} }
//Added by Sana S on 14/01/2020 [start]
else if ("amount".equalsIgnoreCase(currentColumn))
{
amount=checkNull(genericUtility.getColumnValue("amount", dom));
System.out.print("Amount:::"+amount);
if(amount.equals("") || amount.length() == 0 || amount.equals(null))
{
valueXmlString.append("<amount><![CDATA[").append("0").append("]]></amount>\r\n");
System.out.print("Amount:::"+amount);
}
}
//Added by Sana S on 14/01/2020 [end]
else if ("last_proc_for".equalsIgnoreCase(currentColumn)) else if ("last_proc_for".equalsIgnoreCase(currentColumn))
{ {
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom)); lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
...@@ -767,7 +789,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -767,7 +789,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
{ {
valueXmlString.append("<next_proc_date><![CDATA[").append("") valueXmlString.append("<next_proc_date><![CDATA[").append("")
.append("]]></next_proc_date>\r\n"); .append("]]></next_proc_date>\r\n");
} }
else else
{ {
......
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