Skip to content

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

Sana S: Modified on 11/11/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211728 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 26e0fba7
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 20 deletions
webitm-adm/src/ibase/webitm/ejb/adm/PayrollRemarksProcIC.java
View file @ 54b97a94
......@@ -4,8 +4,6 @@ import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
......@@ -28,7 +26,7 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
String taxEnv=null;
String prdCode = null;
Connection con = null;
//Connection con = null;
String sql = "";
E12GenericUtility e12GenericUtility = new E12GenericUtility();
......@@ -89,13 +87,14 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
int childNodeListLength;
StringBuffer errStringXml = null;
int prdFrom=0,prdTo=0;
Connection conn = null;//added by Sana S on 11/11/19
String errCode= "";
errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
try
{
con = getConnection();
conn = getConnection();
if(objContext!=null && objContext.trim().length()>0)
{
currentFormNo = Integer.parseInt(objContext);
......@@ -119,17 +118,18 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
System.out.println("childNodeName.editFlag." + childNodeName + ".." + editFlag);
if (childNodeName.equalsIgnoreCase("prd_code__fr") || childNodeName.equalsIgnoreCase("prd_code__to"))
if (childNodeName.equalsIgnoreCase("prd_code__fr"))
{
String codefrom = checkNull(e12GenericUtility.getColumnValue("prd_code__fr", dom));
String codeto = checkNull(e12GenericUtility.getColumnValue("prd_code__to", dom));
System.out.print("Code from:"+codefrom +"\n Code To:"+codeto);
sql = " select count(1) as cnt from period where code = ? OR code = ? ";
pstmt = con.prepareStatement(sql);
//sql = " select count(1) as cnt from period where code = ? OR code = ? "; //Commented by Sana S on 11/11/19
sql = " select count(1) as cnt from period where code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, codefrom);
pstmt.setString(2, codeto);
// pstmt.setString(2, codeto); //Commented by Sana S on 11/11/19
rs = pstmt.executeQuery();
System.out.println(" SQL :: " + sql);
......@@ -152,7 +152,7 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
if(cnt == 0)
{
errCode = itmDbAcess.getErrorString("", "VMPRD1", userId, "", con);
errCode = itmDbAcess.getErrorString("", "VMPRD1", userId, "", conn);
return errCode;
}
else
......@@ -160,21 +160,85 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
//Modified by Sana S on 31/10/19 [Start]
/*prdCodeFrom=checkNull(e12GenericUtility.getColumnValue("prd_code__fr", dom));
prdCodeTo=checkNull(e12GenericUtility.getColumnValue("prd_code__to", dom));*/
prdCodeFrom=checkInt(e12GenericUtility.getColumnValue("prd_code__fr", dom));
prdCodeTo=checkInt(e12GenericUtility.getColumnValue("prd_code__to", dom));
//Modified by Sana S on 31/10/19 [end]
prdFrom=Integer.parseInt(prdCodeFrom);
prdTo=Integer.parseInt(prdCodeTo);
if(prdFrom > prdTo)
{
errCode = itmDbAcess.getErrorString("", "VMPRD2", userId, "", con);
errCode = itmDbAcess.getErrorString("", "VMPRD2", userId, "", conn);
return errCode;
}
}
}
//Added by Sana S on 11/11/19 [start]
else if(childNodeName.equalsIgnoreCase("prd_code__to"))
{
String codefrom = checkNull(e12GenericUtility.getColumnValue("prd_code__fr", dom));
String codeto = checkNull(e12GenericUtility.getColumnValue("prd_code__to", dom));
System.out.print("Code from:"+codefrom +"\n Code To:"+codeto);
// sql = " select count(1) as cnt from period where code = ? OR code = ? "; //Commented by Sana S on 11/11/19
sql = " select count(1) as cnt from period where code = ? ";
pstmt = conn.prepareStatement(sql);
//Modified by Sana S on 11/11/19 [start]
/*pstmt.setString(1, codefrom);
pstmt.setString(2, codeto);*/
pstmt.setString(1, codeto);
//Modified by Sana S on 11/11/19 [end]
rs = pstmt.executeQuery();
System.out.println(" SQL :: " + sql);
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 = itmDbAcess.getErrorString("", "VMPRD1", userId, "", conn);
return errCode;
}
else
{
//Modified by Sana S on 31/10/19 [Start]
/*prdCodeFrom=checkNull(e12GenericUtility.getColumnValue("prd_code__fr", dom));
prdCodeTo=checkNull(e12GenericUtility.getColumnValue("prd_code__to", dom));*/
prdCodeFrom=checkInt(e12GenericUtility.getColumnValue("prd_code__fr", dom));
prdCodeTo=checkInt(e12GenericUtility.getColumnValue("prd_code__to", dom));
//Modified by Sana S on 31/10/19 [end]
prdFrom=Integer.parseInt(prdCodeFrom);
prdTo=Integer.parseInt(prdCodeTo);
if(prdFrom > prdTo)
{
errCode = itmDbAcess.getErrorString("", "VMPRD2", userId, "", conn);
return errCode;
}
}
}
//Added by Sana S on 11/11/19 [end]
else if (childNodeName.equalsIgnoreCase("remarks"))
{
String remark = checkNull(e12GenericUtility.getColumnValue("remarks", dom));
......@@ -185,7 +249,7 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
{
System.out.println("Remark is null");
errCode = itmDbAcess.getErrorString("", "NULLREM", userId, "", con);
errCode = itmDbAcess.getErrorString("", "NULLREM", userId, "", conn);
return errCode;
}
}
......@@ -193,7 +257,7 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
break;
}
System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
errStringXml.append("</Errors></Root>\r\n");
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
}
......@@ -218,10 +282,10 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
pstmt.close();
pstmt = null;
}
if (con != null)
if (conn != null)
{
con.close();
con = null;
conn.close();
conn = null;
}
}
catch(Exception e1)
......@@ -637,7 +701,7 @@ public class PayrollRemarksProcIC extends ValidatorEJB implements PayrollRemarks
return input;
}
//Added by Sana S on 31/10/19 [end]
private String errorType(Connection conn, String errorCode) throws ITMException
{
String msgType = "";
......
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