Skip to content

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

Sana S:Modified on [03/09/2019] 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@206695 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e59fd4cb
Hide whitespace changes
Inline Side-by-side
Showing with 574 additions and 76 deletions
webitm-adm/src/ibase/webitm/ejb/adm/ITDeclarationIC.java
View file @ 8bf8ec60
...@@ -3,10 +3,14 @@ package ibase.webitm.ejb.adm; ...@@ -3,10 +3,14 @@ package ibase.webitm.ejb.adm;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
...@@ -28,13 +32,16 @@ import org.w3c.dom.NodeList; ...@@ -28,13 +32,16 @@ import org.w3c.dom.NodeList;
public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemote, ITDeclarationICLocal { public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemote, ITDeclarationICLocal {
static E12GenericUtility genericUtility = new E12GenericUtility(); static E12GenericUtility genericUtility = new E12GenericUtility();
//Modified By Sana S on 06/08/2019 [start]
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//Modified By Sana S on 06/08/2019 [end]
String acctPrd = "", empCode = "";; String acctPrd = "", empCode = "";;
@Override @Override
public String wfValData(String xmlString, String xmlStringHdr, String xmlStringAll, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException { public String wfValData(String xmlString, String xmlStringHdr, String xmlStringAll, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException {
String retString = ""; String retString = "";
System.out.println("Method Called1");
Document dom = null, dom1 = null, domAll = null; Document dom = null, dom1 = null, domAll = null;
try { try {
System.out.println("\n\txmlString[" + xmlString + "]\n\txmlStringHdr[" + xmlStringHdr + "]\n\txmlStringAll[" + xmlStringAll + "]\n\tobjContext[" + objContext + "]\n\teditFlag[" + editFlag + "]\n"); System.out.println("\n\txmlString[" + xmlString + "]\n\txmlStringHdr[" + xmlStringHdr + "]\n\txmlStringAll[" + xmlStringAll + "]\n\tobjContext[" + objContext + "]\n\teditFlag[" + editFlag + "]\n");
...@@ -48,6 +55,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -48,6 +55,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
domAll = genericUtility.parseString(xmlStringAll); domAll = genericUtility.parseString(xmlStringAll);
} }
retString = wfValData(dom, dom1, domAll, objContext, editFlag, xtraParams); retString = wfValData(dom, dom1, domAll, objContext, editFlag, xtraParams);
System.out.println("Method Called");
} catch (Exception e) { } catch (Exception e) {
System.out.println(":::" + this.getClass().getSimpleName() + "::" + e.getMessage()); System.out.println(":::" + this.getClass().getSimpleName() + "::" + e.getMessage());
e.getMessage(); e.getMessage();
...@@ -59,6 +67,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -59,6 +67,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
public String wfValData(Document dom, Document domHdr, Document domAll, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException { public String wfValData(Document dom, Document domHdr, Document domAll, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException {
String errString = "", sql = "", acct_prd = "", childNodeName = "", userId = "", emp_code__decl = "", ad_code = "", pay_site = "", cadre = "", grade = "", adm_env = ""; String errString = "", sql = "", acct_prd = "", childNodeName = "", userId = "", emp_code__decl = "", ad_code = "", pay_site = "", cadre = "", grade = "", adm_env = "";
Connection conn = null; Connection conn = null;
String userLevel="";
int userLevelInt = 0;//modified by santsoh on 23JUL2018
NodeList parentNodeList = null, childNodeList = null; NodeList parentNodeList = null, childNodeList = null;
Node parentNode = null, childNode = null; Node parentNode = null, childNode = null;
int ctr = 0, childNodeLength = 0, currentFormNo = 0; int ctr = 0, childNodeLength = 0, currentFormNo = 0;
...@@ -66,9 +76,17 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -66,9 +76,17 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
ResultSet rs = null; ResultSet rs = null;
try { try {
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
ConnDriver con = new ConnDriver(); //Modified By Sana S on 06/08/2019 [start]
conn = con.getConnectDB("Driver"); /*ConnDriver con = new ConnDriver();
conn = con.getConnectDB("Driver");*/
conn=getConnection();
//Modified By Sana S on 06/08/2019 [end]
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
//added by Rupesh [16-11-2017][for Request ID-A17HSUN004�]Start.
String siteCode =genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
String loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
//added by Rupesh [16-11-2017][for Request ID-A17HSUN004�]End.
if (objContext != null && objContext.trim().length() > 0) { if (objContext != null && objContext.trim().length() > 0) {
currentFormNo = Integer.parseInt(objContext); currentFormNo = Integer.parseInt(objContext);
} }
...@@ -84,6 +102,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -84,6 +102,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
if(childNodeName.equalsIgnoreCase("tran_id")) { if(childNodeName.equalsIgnoreCase("tran_id")) {
System.out.println("tran_id");
String key_flag = ""; String key_flag = "";
sql = "select key_flag from transetup where tran_window = ? "; sql = "select key_flag from transetup where tran_window = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -101,7 +120,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -101,7 +120,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
String tran_id = checkNull(genericUtility.getColumnValue("tran_id", dom)).trim(); String tran_id = checkNull(genericUtility.getColumnValue("tran_id", dom)).trim();
if("M".equalsIgnoreCase(key_flag)) { if("M".equalsIgnoreCase(key_flag)) {
if(tran_id.length() <= 0) { if(tran_id.length() <= 0) {
errString = getErrorString("tran_id", "VETRNID1", userId); //errString = getErrorString("tran_id", "VETRNID1", userId);
errString = itmDBAccessEJB.getErrorString("tran_id", "VETRNID1", userId,"",conn); //Modified by sana S on 06/08/2019
break; break;
} else { } else {
sql = "select tran_id from emp_itdecl_hdr where tran_id = ? "; sql = "select tran_id from emp_itdecl_hdr where tran_id = ? ";
...@@ -109,7 +129,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -109,7 +129,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
pstmt.setString(1, tran_id); pstmt.setString(1, tran_id);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) { if(rs.next()) {
errString = getErrorString("tran_id", "VTRANEXIST", userId); //errString = getErrorString("tran_id", "VTRANEXIST", userId);
errString = itmDBAccessEJB.getErrorString("tran_id", "VTRANEXIST", userId,"",conn);//Modified by sana S on 06/08/2019
break; break;
} }
rs.close(); rs.close();
...@@ -124,7 +145,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -124,7 +145,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
pstmt.setString(1, tran_id); pstmt.setString(1, tran_id);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) { if(rs.next()) {
errString = getErrorString("tran_id", "VTRANEXIST", userId); // errString = getErrorString("tran_id", "VTRANEXIST", userId);
errString = itmDBAccessEJB.getErrorString("tran_id", "VTRANEXIST", userId,"",conn);//Modified by sana S on 06/08/2019
break; break;
} }
rs.close(); rs.close();
...@@ -136,19 +158,22 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -136,19 +158,22 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
if (childNodeName.equalsIgnoreCase("acct_prd")) { if (childNodeName.equalsIgnoreCase("acct_prd")) {
System.out.println("acct_prd");
acct_prd = checkNull(genericUtility.getColumnValue(childNodeName.toLowerCase(), dom)); acct_prd = checkNull(genericUtility.getColumnValue(childNodeName.toLowerCase(), dom));
emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom)); emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom));
pay_site = checkNull(genericUtility.getColumnValue("pay_site", dom)); pay_site = checkNull(genericUtility.getColumnValue("pay_site", dom));
grade = checkNull(genericUtility.getColumnValue("grade", dom)); grade = checkNull(genericUtility.getColumnValue("grade", dom));
cadre = checkNull(genericUtility.getColumnValue("cadre", dom)); cadre = checkNull(genericUtility.getColumnValue("cadre", dom));
adm_env = checkNull(genericUtility.getColumnValue("adm_env", dom)); adm_env = checkNull(genericUtility.getColumnValue("adm_env", dom));
if (acct_prd.trim().length() > 0) { if (acct_prd.trim().length() > 0) {
sql = "select code from acctprd where code = ?"; sql = "select code from acctprd where code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, acct_prd); pstmt.setString(1, acct_prd);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (!rs.next()) { if (!rs.next()) {
errString = getErrorString("acct_prd", "VMFENACP04", userId); //errString = getErrorString("acct_prd", "VMFENACP04", userId);
errString = itmDBAccessEJB.getErrorString("acct_prd", "VMFENACP04", userId,"",conn);//Modified by sana S on 06/08/2019
break; break;
} }
rs.close(); rs.close();
...@@ -187,7 +212,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -187,7 +212,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
String todateString = sdf.format(toDate); String todateString = sdf.format(toDate);
boolean futuredate = checkFutureDate(todateString); boolean futuredate = checkFutureDate(todateString);
if (!futuredate ) { if (!futuredate ) {
errString = getErrorString("acct_prd", "NOTACCTPRD", userId); //errString = getErrorString("acct_prd", "NOTACCTPRD", userId);
errString = itmDBAccessEJB.getErrorString("acct_prd", "NOTACCTPRD", userId,"",conn);//Modified by sana S on 06/08/2019
break; break;
} }
...@@ -243,63 +269,79 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -243,63 +269,79 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
}*/ }*/
} else { } else {
errString = getErrorString("acct_prd", "VMFENACP03", userId); //errString = getErrorString("acct_prd", "VMFENACP03", userId);
errString = itmDBAccessEJB.getErrorString("acct_prd", "VMFENACP03", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} }
} }
if(childNodeName.equalsIgnoreCase("adm_env")) { if(childNodeName.equalsIgnoreCase("adm_env")) {
System.out.println("adm_env");
adm_env = checkNull(genericUtility.getColumnValue("adm_env", dom)).trim(); adm_env = checkNull(genericUtility.getColumnValue("adm_env", dom)).trim();
pay_site = checkNull(genericUtility.getColumnValue("pay_site", dom)); pay_site = checkNull(genericUtility.getColumnValue("pay_site", dom));
cadre = checkNull(genericUtility.getColumnValue("cadre", dom)); cadre = checkNull(genericUtility.getColumnValue("cadre", dom));
grade = checkNull(genericUtility.getColumnValue("grade", dom)); grade = checkNull(genericUtility.getColumnValue("grade", dom));
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]start
acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom));
Timestamp acctFromDate = getAcctFromDate(acct_prd, conn);
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]end
if(adm_env.length() > 0) { if(adm_env.length() > 0) {
String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", new Timestamp(Calendar.getInstance().getTimeInMillis()), conn); //String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", new Timestamp(Calendar.getInstance().getTimeInMillis()), conn);
String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", acctFromDate, conn);//Modified by Ahmed on 29/NOV/2017[A17HSUN004]
System.out.println("\n\t admEnv["+admEnv+"] \n\t " + adm_env); System.out.println("\n\t admEnv["+admEnv+"] \n\t " + adm_env);
if("NULLFOUND".equalsIgnoreCase(adm_env)) { if("NULLFOUND".equalsIgnoreCase(admEnv)) {
admEnv = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn); admEnv = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn);
if("NULLFOUND".equalsIgnoreCase(adm_env)) { if("NULLFOUND".equalsIgnoreCase(admEnv)) {
errString = getErrorString("", "VSENVAR1", userId); //errString = getErrorString("", "VSENVAR1", userId);
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} else if(!admEnv.equalsIgnoreCase(adm_env)) { } else if(!admEnv.equalsIgnoreCase(adm_env)) {
errString = getErrorString("", "VSENVAR1", userId); //errString = getErrorString("", "VSENVAR1", userId);
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} }
System.out.println("\n\t admEnv["+admEnv+"] \n\t " + adm_env); System.out.println("\n\t admEnv["+admEnv+"] \n\t " + adm_env);
} else if(!admEnv.equalsIgnoreCase(adm_env)) { } /*else if(!admEnv.equalsIgnoreCase(adm_env)) {
errString = getErrorString("", "VSENVAR1", userId); errString = getErrorString("", "VSENVAR1", userId);
break; break;
} }*/
System.out.println("\n\t admEnv["+admEnv+"] \n\t " + adm_env); System.out.println("\n\t admEnv["+admEnv+"] \n\t " + adm_env);
} else { } else {
errString = getErrorString("", "VSENVAR1", userId); //errString = getErrorString("", "VSENVAR1", userId);
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} }
} }
System.out.println("@RR@ :::: >>> iN mY VALIDATION");
if (childNodeName.equalsIgnoreCase("emp_code__decl")) { if (childNodeName.equalsIgnoreCase("emp_code__decl")) {
java.sql.Date relieve_date = null; System.out.println("emp_code__decl");
//java.sql.Date relieve_date = null;
String status = "";
emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom)); emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom));
acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom)); acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom));
if (emp_code__decl.trim().length() == 0) { if (emp_code__decl.trim().length() == 0) {
errString = getErrorString("emp_code__decl", "VTEMPCDNUL", userId); // errString = getErrorString("emp_code__decl", "VTEMPCDNUL", userId);
errString = itmDBAccessEJB.getErrorString("emp_code__decl", "VTEMPCDNUL", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} else { } else {
sql = "select emp_code, relieve_date from employee where emp_code = ?"; //modified by Rupesh on[15/11/2017][for Request ID-A17HSUN004 ] start.
//sql = "select emp_code, relieve_date from employee where emp_code = ?";
sql = "select emp_code, status from employee where emp_code = ?";
//modified by Rupesh on[15/11/2017][for Request ID-A17HSUN004 ] End.
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, emp_code__decl); pstmt.setString(1, emp_code__decl);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (!rs.next()) { if (!rs.next()) {
errString = getErrorString("emp_code__decl", "VTEMPCDINV", userId); //errString = getErrorString("emp_code__decl", "VTEMPCDINV", userId);
errString = itmDBAccessEJB.getErrorString("emp_code__decl", "VTEMPCDINV", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} else { } else {
relieve_date = rs.getDate("relieve_date"); //modified by Rupesh on[15/11/2017][for Request ID-A17HSUN004 ] start.
//relieve_date = rs.getDate("relieve_date");
status = rs.getString("status");
//modified by Rupesh on[15/11/2017][for Request ID-A17HSUN004 ] End.
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -319,22 +361,26 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -319,22 +361,26 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if (relieve_date != null || confirmed.equalsIgnoreCase("Y")) { //modified by Rupesh on[15/11/2017][for Request ID-A17HSUN004 ] start.
errString = getErrorString("tran_date","VTEMPRELFS",userId); //if (relieve_date != null || confirmed.equalsIgnoreCase("Y")) {
//modified by Rupesh on[15/11/2017][for Request ID-A17HSUN004 ] End.
if((status != null && status.equalsIgnoreCase("S"))|| confirmed.equalsIgnoreCase("Y")){
//errString = getErrorString("tran_date","VTEMPRELFS",userId);
errString = itmDBAccessEJB.getErrorString("tran_date","VTEMPRELFS",userId,"",conn);////Modified by sana S on 06/08/2019
System.out.println("@@in status S--"+status);
break; break;
} }
sql = "select tran_id from emp_itdecl_hdr where qtr_no = '9' and decl_type ='D' and confirmed = 'N' and emp_code__decl = ? and acct_prd = ?"; sql = "select tran_id from emp_itdecl_hdr where qtr_no = '9' and decl_type ='D' and confirmed = 'N' and emp_code__decl = ? and acct_prd = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, emp_code__decl); pstmt.setString(1, emp_code__decl);
pstmt.setString(2, acct_prd); pstmt.setString(2, acct_prd);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
errString = getErrorString("emp_code__decl", "VTEMP4", userId); //errString = getErrorString("emp_code__decl", "VTEMP4", userId);
errString = itmDBAccessEJB.getErrorString("emp_code__decl", "VTEMP4", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} }
rs.close(); rs.close();
...@@ -343,15 +389,24 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -343,15 +389,24 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
pstmt = null; pstmt = null;
} }
} }
System.out.println("@RR@ :::: >>> OUT mY VALIDATION");
if (childNodeName.equalsIgnoreCase("emp_code__ac")) { if (childNodeName.equalsIgnoreCase("emp_code__ac")) {
System.out.println("emp_code__ac");
String paySiteCode="";//added by Rupesh [16-11-2017][for Request ID-A17HSUN004�]Start.
ArrayList<String> siteList = new ArrayList<String>();//added by Rupesh [on 17/11/2017][for Request ID-A17HSUN004�]
String empCodeDecl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom));
System.out.println("@@--empCodeDecl--"+"["+empCodeDecl+"]");
emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__ac", dom)); emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__ac", dom));
System.out.println("@@--emp_code__decl--"+"["+emp_code__decl+"]");
pay_site = checkNull(genericUtility.getColumnValue("pay_site", dom)); pay_site = checkNull(genericUtility.getColumnValue("pay_site", dom));
System.out.println("@@--pay_site--"+"["+pay_site+"]");
if (emp_code__decl.trim().length() == 0) { if (emp_code__decl.trim().length() == 0) {
errString = getErrorString("emp_code__ac", "VTEMPCDNUL", userId); //errString = getErrorString("emp_code__ac", "VTEMPCDNUL", userId);
errString = itmDBAccessEJB.getErrorString("emp_code__ac", "VTEMPCDNUL", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} else { } else {
sql = "select site_code from site_itdecl_aprvr where ? in (emp_code__aprv,emp_code__aprv_alt1,emp_code__aprv_alt2) and site_code = ?"; //Modified by Rupesh [17-11-2017][for Request ID-A17HSUN004�]Start.
/*sql = "select site_code from site_itdecl_aprvr where ? in (emp_code__aprv,emp_code__aprv_alt1,emp_code__aprv_alt2) and site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, emp_code__decl); pstmt.setString(1, emp_code__decl);
pstmt.setString(2, pay_site); pstmt.setString(2, pay_site);
...@@ -363,7 +418,65 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -363,7 +418,65 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null;*/
System.out.println("@R@ :::>>> site code error @1 user_site");
String loginCode = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
sql = "select site_code from user_site where user_id=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginCode);
rs = pstmt.executeQuery();
System.out.println("@@ user site code condition ");
while(rs.next()){
siteList.add(rs.getString("site_code"));
System.out.println("@@ site_code List --"+siteList);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("@R@ :::>>> site code error @2 employee");
sql = "select pay_site from employee where emp_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCodeDecl);
rs = pstmt.executeQuery();
if(rs.next()){
paySiteCode =rs.getString("pay_site");
System.out.println("@@@ paySiteCode>>"+"["+paySiteCode+"]");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null; pstmt = null;
String loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//Modified by santosh to validate on the bases of level code.START
sql = "select usr_lev from users where code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginCode);
rs = pstmt.executeQuery();
if(rs.next())
{
userLevel =rs.getString("usr_lev");
System.out.println("@@@ userLevel>>"+"["+userLevel+"]");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
userLevelInt= Integer.parseInt(userLevel);
System.out.println("@@@ userLevelInt>>"+"["+userLevelInt+"]");
//Modified by santosh to validate on the bases of level code.END
//if(!siteList.contains(paySiteCode)){
//if(!siteList.contains(paySiteCode)) Commented by santsoh
if(!siteList.contains(paySiteCode) && userLevelInt > 1)
{
//errString = getErrorString("", "VTIVDECLAC", userId);
errString = itmDBAccessEJB.getErrorString("", "VTIVDECLAC", userId,"",conn);////Modified by sana S on 06/08/2019
System.out.println("@R@ :::>>> site code error");
break;
}
//Modified by Rupesh [17-11-2017][for Request ID-A17HSUN004�]End.
} }
} }
} }
...@@ -394,15 +507,30 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -394,15 +507,30 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
if (!isNegativeAllowed) { if (!isNegativeAllowed) {
if (tempAmt < 0) { if (tempAmt < 0) {
errString = getErrorString("amount_decl", "VMAMT1", userId); //errString = getErrorString("amount_decl", "VMAMT1", userId);
errString = itmDBAccessEJB.getErrorString("amount_decl", "VMAMT1", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} }
} }
} }
if (childNodeName.equalsIgnoreCase("ad_code")) { if (childNodeName.equalsIgnoreCase("ad_code")) {
int sqlCnt=0;
ArrayList<String> tranIDList = new ArrayList<String>();//added by Rupesh [on 17/11/2017][for Request ID-A17HSUN004�]
emp_code__decl=checkNull(genericUtility.getColumnValue("emp_code__decl", domHdr));//added by Rupesh [on 17/11/2017][for Request ID-A17HSUN004�]
System.out.println("@@ emp_code__decl --"+"["+emp_code__decl+"]");
acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", domHdr));//added by Rupesh [on 17/11/2017][for Request ID-A17HSUN004�]
System.out.println("@@ acct_prd --"+"["+acct_prd+"]");
ArrayList<String> adCodeList = new ArrayList<String>();//added by Rupesh [on 17/11/2017][for Request ID-A17HSUN004�]
ad_code = checkNull(genericUtility.getColumnValue("ad_code", dom)).trim(); ad_code = checkNull(genericUtility.getColumnValue("ad_code", dom)).trim();
cadre = checkNull(genericUtility.getColumnValue("cadre", domHdr));
grade = checkNull(genericUtility.getColumnValue("grade", domHdr));
pay_site = checkNull(genericUtility.getColumnValue("pay_site", domHdr));
System.out.println("@@ ad_code =="+"["+ad_code+"]");
if (ad_code.length() <= 0) { if (ad_code.length() <= 0) {
errString = getErrorString("ad_code", "VMADDNAL", userId); //errString = getErrorString("ad_code", "VMADDNAL", userId);
errString = itmDBAccessEJB.getErrorString("ad_code", "VMADDNAL", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} else { } else {
sql = "select i.ad_code from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code and i.ad_code = ? "; sql = "select i.ad_code from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code and i.ad_code = ? ";
...@@ -411,15 +539,89 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -411,15 +539,89 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(!rs.next()){ if(!rs.next()){
System.out.println("AD_CODE IS INVALID : [" + ad_code + "]"); System.out.println("AD_CODE IS INVALID : [" + ad_code + "]");
errString = getErrorString("ad_code", "VMAD3", userId); //errString = getErrorString("ad_code", "VMAD3", userId);
errString = itmDBAccessEJB.getErrorString("ad_code", "VMAD3", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} else { } else {
System.out.println("AD_CODE IS VALID : [" + ad_code + "]"); Timestamp acctFromDate = getAcctFromDate(acct_prd, conn);
String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", acctFromDate, conn);
if("NULLFOUND".equalsIgnoreCase(admEnv)) {
admEnv = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn);
if("NULLFOUND".equalsIgnoreCase(admEnv)) {
admEnv = "";
}
}
if("A".equalsIgnoreCase(admEnv)) {
sql = "select count(*) as count from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code where i.access_to = 'A' and i.ad_code = ?";
} else if("E".equalsIgnoreCase(admEnv)) {
sql = "select count(*) as count from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code where i.access_to is null and i.ad_code = ?";
} else if("B".equalsIgnoreCase(admEnv)) {
sql = "select count(*) as count from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code and i.ad_code = ?";
}
PreparedStatement pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, ad_code);
ResultSet rs1 = pstmt1.executeQuery();
int sqlCount = 0;
if(rs1.next()) {
sqlCount = rs1.getInt("count");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
if(sqlCount == 0)
{
System.out.println("AD_CODE IS INVALID : [" + ad_code + "]");
//errString = getErrorString("ad_code", "VMAD3", userId);
errString = itmDBAccessEJB.getErrorString("ad_code", "VMAD3", userId,"",conn);////Modified by sana S on 06/08/2019
break;
}
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//added by Rupesh [on 17/11/2017][for Request ID-A17HSUN004�]Start
System.out.println("@R@ in tran_id,ad_code error from emp_itdecl_hdr ");
String tran_id = checkNull(genericUtility.getColumnValue("tran_id", domHdr));
System.out.println("@@--tran_id--"+"["+tran_id+"]");
sql = "select tran_id from emp_itdecl_hdr where emp_code__decl =? and acct_prd =? and qtr_no!=9";
System.out.println("at tran_id condition --"+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, emp_code__decl);
pstmt.setString(2, acct_prd);
rs = pstmt.executeQuery();
while(rs.next()){
tranIDList.add(checkNull(rs.getString("tran_id")));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//if(tranIDList.contains(tran_id)){
for(String tranID : tranIDList){
System.out.println(" transaction id list matches tran_id"+tran_id);
System.out.println("@@in tran_id List--");
sql ="select ad_code from emp_itdecl_det where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranID);
rs = pstmt.executeQuery();
while(rs.next()){
adCodeList.add(checkNull(rs.getString("ad_code")));
}
if(adCodeList.contains(ad_code)){
//errString = getErrorString("ad_code", "VTITMDEC09", userId);
errString = itmDBAccessEJB.getErrorString("ad_code", "VTITMDEC09", userId,"",conn);////Modified by sana S on 06/08/2019
System.out.println("in ad_code checking emp_itdecl_det--");
break;
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
//added by Rupesh [on 16/11/2017][for Request ID-A17HSUN004�]End
} }
} }
if (childNodeName.equalsIgnoreCase("amount_proof")) { if (childNodeName.equalsIgnoreCase("amount_proof")) {
...@@ -436,7 +638,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -436,7 +638,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
if (!isNegativeAllowed) { if (!isNegativeAllowed) {
if (tempAmt < 0) { if (tempAmt < 0) {
errString = getErrorString("amount_proof", "VMAMT1", userId); //errString = getErrorString("amount_proof", "VMAMT1", userId);
errString = itmDBAccessEJB.getErrorString("amount_proof", "VMAMT1", userId,"",conn);////Modified by sana S on 06/08/2019
break; break;
} }
} }
...@@ -447,7 +650,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -447,7 +650,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println(":::" + this.getClass().getSimpleName() + ":::" + e.getMessage()); System.out.println(":::" + this.getClass().getSimpleName() + ":::" + e.getMessage());
errString = getErrorString("", "VTINEX", userId); //errString = getErrorString("", "VTINEX", userId);
errString = itmDBAccessEJB.getErrorString("", "VTINEX", userId,"",conn);////Modified by sana S on 06/08/2019
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
...@@ -470,6 +674,55 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -470,6 +674,55 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
return errString; return errString;
} }
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]start
private Timestamp getAcctFromDate(String acctPrd, Connection conn) throws ITMException, SQLException
{
Timestamp retValue = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
String sql = "SELECT FR_DATE, TO_DATE FROM ACCTPRD WHERE CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, acctPrd);
rs = pstmt.executeQuery();
if(rs.next())
{
retValue = rs.getTimestamp("FR_DATE");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
return retValue;
}
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]end
private boolean checkFutureDate(String strDate) throws ITMException { private boolean checkFutureDate(String strDate) throws ITMException {
boolean result = false; boolean result = false;
...@@ -481,7 +734,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -481,7 +734,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
Date currDate = cal.getTime(); Date currDate = cal.getTime();
currDate.setHours(0); currDate.setHours(0);
currDate.setMinutes(0); currDate.setMinutes(0);
currDate.setSeconds(0); currDate.setSeconds(0);
finEffDate.setHours(0); finEffDate.setHours(0);
finEffDate.setMinutes(0); finEffDate.setMinutes(0);
finEffDate.setSeconds(0); finEffDate.setSeconds(0);
...@@ -542,43 +795,51 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -542,43 +795,51 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
try { try {
if (xmlString != null && xmlString.trim().length() > 0) { if (xmlString != null && xmlString.trim().length() > 0) {
dom = genericUtility.parseString(xmlString); dom = genericUtility.parseString(xmlString);
System.out.println("@S@ xmlString>>["+xmlString+"]");
} }
if (xmlStringHdr != null && xmlStringHdr.trim().length() > 0) { if (xmlStringHdr != null && xmlStringHdr.trim().length() > 0) {
domHdr = genericUtility.parseString(xmlStringHdr); domHdr = genericUtility.parseString(xmlStringHdr);
System.out.println("@S@ xmlStringHdr>>["+xmlStringHdr+"]");
} }
if (xmlStringAll != null && xmlStringAll.trim().length() > 0) { if (xmlStringAll != null && xmlStringAll.trim().length() > 0) {
domAll = genericUtility.parseString(xmlStringAll); domAll = genericUtility.parseString(xmlStringAll);
System.out.println("[@S@ xmlStringAll>>"+xmlStringAll+"]");
} }
valueXmlString = itemChanged(dom, domHdr, domAll, objContext, currentColumn, editFlag, xtraParams); valueXmlString = itemChanged(dom, domHdr, domAll, objContext, currentColumn, editFlag, xtraParams);
} catch (Exception e) { } catch (Exception e) {
System.out.println("Exception [" + this.getClass().getSimpleName() + "] : [itemChanged(S)] " + e.getMessage()); System.out.println("Exception [" + this.getClass().getSimpleName() + "] : [itemChanged(S)] " + e.getMessage());
} }
return valueXmlString; return valueXmlString;
} }
public String itemChanged(Document dom, Document dom1, Document dom2, public String itemChanged(Document dom, Document dom1, Document dom2,
String objContext, String currentColumn, String editFlag, String objContext, String currentColumn, String editFlag,
String xtraParams) throws RemoteException, ITMException { String xtraParams) throws RemoteException, ITMException {
String sql = "", acct_prd = "", emp_code__decl = "", emp_code__ac = "", emp_name = "", empac_name = "", pay_site = "", it_no = "", email_id = "", str_amount = "", grade = "", cadre = "", adm_env = ""; String sql = "", acct_prd = "", emp_code__decl = "", emp_code__ac = "", emp_name = "", empac_name = "", pay_site = "", it_no = "", email_id = "", str_amount = "", grade = "", cadre = "", adm_env = "";
String amountProofOld="",amountDeclOld="",tranIdLast="";
int currentFormNo = 0, seq_no = 0; int currentFormNo = 0, seq_no = 0;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
//Modification done by santosh for upload utility 23-OCT-2018 .START
PreparedStatement pstmt1 = null;
ResultSet rs1 = null;
String sql1 ="";
//Modification done by santosh for upload utility 23-OCT-2018 .END
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
List<String> adCodeList = new ArrayList<String>();
String empLoginCode = getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"); String empLoginCode = getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
try { try {
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
ConnDriver connDriver = new ConnDriver(); //Modified By Sana S on 28/08/2019[start]
conn = connDriver.getConnectDB("Driver"); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("Driver");*/
conn=getConnection();
// Modified By Sana S on 28/08/2019[end]
// String userId = String userId =genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
// genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
if (objContext != null && objContext.trim().length() > 0) { if (objContext != null && objContext.trim().length() > 0) {
currentFormNo = Integer.parseInt(objContext); currentFormNo = Integer.parseInt(objContext);
...@@ -594,8 +855,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -594,8 +855,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
case 1: { case 1: {
valueXmlString.append("<Detail1>\r\n"); valueXmlString.append("<Detail1>\r\n");
valueXmlString.append("<chg_date><![CDATA[").append(today).append("]]></chg_date>"); valueXmlString.append("<chg_date><![CDATA[").append(today).append("]]></chg_date>");
System.out.print("chg_date:"+today+"currentColumn:"+currentColumn);
if (currentColumn.trim().equals("itm_default")) { if (currentColumn.trim().equals("itm_default")) {
/*if (currentColumn.trim().equals("pay_site")) {*/
System.out.print("U R IN:");
String key_flag = ""; String key_flag = "";
sql = "select key_flag from transetup where tran_window = ? "; sql = "select key_flag from transetup where tran_window = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -616,18 +881,20 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -616,18 +881,20 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
acct_prd = checkNull(rs.getString("code")); acct_prd = checkNull(rs.getString("code"));
System.out.print("acct_prd:"+acct_prd);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select ddf_get_masters_name('EMPLOYEE', e.emp_code,'FML') as empac_name from employee e where e.emp_code = ?"; sql = "select ddf_get_masters_name('EMPLOYEE', emp_code,'FML') as empac_name from employee where emp_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empLoginCode); pstmt.setString(1, empLoginCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
empac_name = rs.getString("empac_name"); empac_name = rs.getString("empac_name");
System.out.print("empac_name:"+empac_name);
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -660,7 +927,9 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -660,7 +927,9 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
if("M".equalsIgnoreCase(key_flag)) { if("M".equalsIgnoreCase(key_flag)) {
valueXmlString.append("<tran_id protect = '0'/>"); valueXmlString.append("<tran_id protect = '0'/>");
} }
System.out.print("empLoginCode:"+empLoginCode +"\tacc prd:"+acct_prd);
valueXmlString.append("<tran_date><![CDATA[").append(today).append("]]></tran_date>"); valueXmlString.append("<tran_date><![CDATA[").append(today).append("]]></tran_date>");
valueXmlString.append("<acct_prd><![CDATA[").append(acct_prd).append("]]></acct_prd>"); valueXmlString.append("<acct_prd><![CDATA[").append(acct_prd).append("]]></acct_prd>");
valueXmlString.append("<emp_code__ac><![CDATA[").append(empLoginCode).append("]]></emp_code__ac>"); valueXmlString.append("<emp_code__ac><![CDATA[").append(empLoginCode).append("]]></emp_code__ac>");
...@@ -685,10 +954,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -685,10 +954,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
valueXmlString.append("<emp_code__decl protect = '1'><![CDATA[").append(emp_code__decl).append("]]></emp_code__decl>"); valueXmlString.append("<emp_code__decl protect = '1'><![CDATA[").append(emp_code__decl).append("]]></emp_code__decl>");
valueXmlString.append("<acct_prd protect = '1'><![CDATA[").append(acct_prd).append("]]></acct_prd>"); valueXmlString.append("<acct_prd protect = '1'><![CDATA[").append(acct_prd).append("]]></acct_prd>");
*/} */}
System.out.print("currentColumn1"+currentColumn);
if (currentColumn.trim().equals("emp_code__decl")) { if (currentColumn.trim().equals("emp_code__decl")) {
emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom)).trim(); emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom)).trim();
acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom)); acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom));
System.out.print("emp code decl:"+emp_code__decl +"\tacc prd:"+acct_prd);
if (emp_code__decl.length() > 0) { if (emp_code__decl.length() > 0) {
sql = "select pay_site, it_no, ddf_get_masters_name('EMPLOYEE', emp_code,'FML') as emp_name, email_id_off as email_id, grade, cadre from employee where emp_code = ?"; sql = "select pay_site, it_no, ddf_get_masters_name('EMPLOYEE', emp_code,'FML') as emp_name, email_id_off as email_id, grade, cadre from employee where emp_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -720,8 +991,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -720,8 +991,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
valueXmlString.append("<it_no><![CDATA[").append(it_no).append("]]></it_no>"); valueXmlString.append("<it_no><![CDATA[").append(it_no).append("]]></it_no>");
valueXmlString.append("<grade><![CDATA[").append(grade).append("]]></grade>"); valueXmlString.append("<grade><![CDATA[").append(grade).append("]]></grade>");
valueXmlString.append("<cadre><![CDATA[").append(cadre).append("]]></cadre>"); valueXmlString.append("<cadre><![CDATA[").append(cadre).append("]]></cadre>");
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]start
adm_env = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", new Timestamp(Calendar.getInstance().getTimeInMillis()), conn); acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom));
Timestamp acctFromDate = getAcctFromDate(acct_prd, conn);
//adm_env = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", new Timestamp(Calendar.getInstance().getTimeInMillis()), conn);
adm_env = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", acctFromDate, conn);//Modified by Ahmed on 29/NOV/2017[A17HSUN004]
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]end
if("NULLFOUND".equalsIgnoreCase(adm_env)) { if("NULLFOUND".equalsIgnoreCase(adm_env)) {
adm_env = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn); adm_env = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn);
if("NULLFOUND".equalsIgnoreCase(adm_env)) { if("NULLFOUND".equalsIgnoreCase(adm_env)) {
...@@ -757,10 +1032,11 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -757,10 +1032,11 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
break; break;
case 2: { case 2: {
valueXmlString.append("<Detail2>\r\n"); valueXmlString.append("<Detail2>\r\n");
System.out.println("*Before itm_default OF CASE 2."); System.out.println("*Before itm_default OF CASE 2:"+currentColumn);
if(currentColumn.trim().equals("itm_default")) { if(currentColumn.trim().equals("itm_default")) {
String tran_id = checkNull(genericUtility.getColumnValue("tran_id", dom2, "1")); String tran_id = checkNull(genericUtility.getColumnValue("tran_id", dom2, "1"));
System.out.println("Tran ID Value:"+tran_id);
String key_flag = ""; String key_flag = "";
sql = "select key_flag from transetup where tran_window = ? "; sql = "select key_flag from transetup where tran_window = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -780,8 +1056,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -780,8 +1056,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
valueXmlString.append("<tran_id>").append("<![CDATA[" + tran_id + "]]>").append("</tran_id>"); valueXmlString.append("<tran_id>").append("<![CDATA[" + tran_id + "]]>").append("</tran_id>");
} }
String ad_code = checkNull(genericUtility.getColumnValue("amount_decl", dom)).trim(); //String ad_code = checkNull(genericUtility.getColumnValue("amount_decl", dom)).trim();
String ad_code = checkNull(genericUtility.getColumnValue("ad_code", dom)).trim();
System.out.println("AD CODE="+ad_code);
String ad_descr = ""; String ad_descr = "";
if(ad_code.length() > 0) { if(ad_code.length() > 0) {
sql = "select i.description as ad_descr from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code where i.ad_code = ?"; sql = "select i.description as ad_descr from itdecl_fmt i join allwdedn a on a.ad_code = i.ad_code where i.ad_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -795,20 +1075,222 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -795,20 +1075,222 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
valueXmlString.append("<ad_descr><![CDATA[").append(ad_descr).append("]]></ad_descr>"); valueXmlString.append("<ad_descr><![CDATA[").append(ad_descr).append("]]></ad_descr>");
} }
valueXmlString.append("<ad_code protect ='1'><![CDATA[]]></ad_code>");
} }
//Modification done by santosh for upload utility 23-OCT-2018 .START
if (currentColumn.trim().equals("itm_defaultedit"))
{
String tranId = checkNull(genericUtility.getColumnValue("tran_id", dom2, "1"));
sql="select line_no,ad_code,amount_decl,amount_proof,amount_decl__old,amount_proof__old,remarks,is_changed,is_proofok from emp_itdecl_det where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
valueXmlString.append("<tran_id><![CDATA[").append(tranId).append("]]></tran_id>");
valueXmlString.append("<line_no><![CDATA[").append(rs.getInt("line_no")).append("]]></line_no>");
String adCode = checkNull(rs.getString("ad_code"));
valueXmlString.append("<ad_code protect ='1'><![CDATA[").append(adCode).append("]]></ad_code>");
valueXmlString.append("<amount_decl><![CDATA[").append(rs.getInt("amount_decl")).append("]]></amount_decl>");
valueXmlString.append("<amount_proof><![CDATA[").append(rs.getInt("amount_proof")).append("]]></amount_proof>");
valueXmlString.append("<amount_decl__old><![CDATA[").append(rs.getInt("amount_decl__old")).append("]]></amount_decl__old>");
valueXmlString.append("<amount_proof__old><![CDATA[").append(rs.getInt("amount_proof__old")).append("]]></amount_proof__old>");
valueXmlString.append("<remarks><![CDATA[").append(checkNull(rs.getString("remarks"))).append("]]></remarks>");
valueXmlString.append("<is_changed><![CDATA[").append(checkNull(rs.getString("is_changed"))).append("]]></is_changed>");
valueXmlString.append("<is_proofok><![CDATA[").append(checkNull(rs.getString("is_proofok"))).append("]]></is_proofok>");
System.out.println("@S@tranIdLast["+tranIdLast+"]");
sql1="select descr from allwdedn where ad_code= ? ";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, adCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
valueXmlString.append("<ad_descr><![CDATA[").append(checkNull(rs.getString("descr"))).append("]]></ad_descr>");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
//Modification done by santosh for upload utility 23-OCT-2018 .END
if (currentColumn.trim().equals("amount_decl")) { if (currentColumn.trim().equals("amount_decl")) {
str_amount = checkNull(genericUtility.getColumnValue("amount_decl", dom)).trim(); str_amount = checkNull(genericUtility.getColumnValue("amount_decl", dom));
System.out.println("@S@ amount_decl str_amount>>"+str_amount);
if (str_amount.length() == 0) { if (str_amount.length() == 0) {
valueXmlString.append("<amount_decl><![CDATA[0]]></amount_decl>"); valueXmlString.append("<amount_decl><![CDATA[0]]></amount_decl>");
} }
} }
if (currentColumn.trim().equals("amount_proof")) { if (currentColumn.trim().equals("amount_proof"))
str_amount = checkNull(genericUtility.getColumnValue("amount_proof", dom)).trim(); {
str_amount = checkNull(genericUtility.getColumnValue("amount_proof", dom));
System.out.println("@S@ amount_proof str_amount>>"+str_amount);
if (str_amount.length() == 0) { if (str_amount.length() == 0) {
valueXmlString.append("<amount_proof><![CDATA[0]]></amount_proof>"); valueXmlString.append("<amount_proof><![CDATA[0]]></amount_proof>");
} }
} }
//Modified by santosh to set amount proof old while using uploading A17JSUN001 .START
//if (currentColumn.trim().equals("amount_proof__old"))
if (currentColumn.trim().equalsIgnoreCase("amount_proof") || currentColumn.trim().equalsIgnoreCase("amount_decl"))
{
String adCode = checkNull(genericUtility.getColumnValue("ad_code", dom));
amountProofOld = checkNull(genericUtility.getColumnValue("amount_proof__old", dom));
amountDeclOld = checkNull(genericUtility.getColumnValue("amount_decl__old", dom));
emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom1));
acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom1));
String qtrNo = checkNull(genericUtility.getColumnValue("qtr_no", dom1));
System.out.println("@S@ emp_code__decl["+emp_code__decl+"][acct_prd]["+acct_prd+"]");
System.out.println("@S@ amountProofOld["+amountProofOld+"][amountDeclOld]["+amountDeclOld+"]");
/*if ("0".equalsIgnoreCase(amountProofOld) || "0".equalsIgnoreCase(amountDeclOld))
{*/
//sql="select max(tran_id) as tran_id from emp_itdecl_hdr where emp_code__decl= ? and acct_prd= ? ";
sql="select max(h.tran_id) as tran_id from emp_itdecl_hdr h,emp_itdecl_det d where " +
"h.tran_id = d.tran_id and h.emp_code__decl= ? and h.acct_prd = ? and h.qtr_no = ? and d.ad_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, emp_code__decl);
pstmt.setString(2, acct_prd);
pstmt.setString(3, qtrNo);
pstmt.setString(4, adCode);
rs = pstmt.executeQuery();
if(rs.next())
{
tranIdLast = checkNull(rs.getString("tran_id"));
System.out.println("@S@tranIdLast["+tranIdLast+"]");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(tranIdLast!= null && tranIdLast.trim().length()>0)
{
//sql=" select amount_decl__old,amount_proof__old from emp_itdecl_det where tran_id= ? ";
sql=" select amount_decl,amount_proof from emp_itdecl_det where tran_id= ? and ad_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdLast);
pstmt.setString(2,adCode);
rs = pstmt.executeQuery();
while(rs.next())
{
valueXmlString.append("<amount_proof__old><![CDATA[").append(rs.getString("amount_proof")).append("]]></amount_proof__old>");
valueXmlString.append("<amount_decl__old><![CDATA[").append(rs.getString("amount_decl")).append("]]></amount_decl__old>");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
//}
}
if (currentColumn.trim().equals("ad_code"))
{
NodeList parentNodeList = dom2.getElementsByTagName("Detail2");
for (int i = 0; i < parentNodeList.getLength(); i++)
{
Node parentNode = parentNodeList.item(i);
NodeList childNodeList = parentNode.getChildNodes();
int childNodeLength = childNodeList.getLength();
//ArrayList<String> adCodeDomList = new ArrayList<String>();
for (int ctr = 0; ctr < childNodeLength; ctr++) {
Node childNode = childNodeList.item(ctr);
String childNodeName = childNode.getNodeName();
if("ad_code".equalsIgnoreCase(childNodeName))
{
String childNodeValue = "";
if (childNode.getFirstChild() != null)
{
childNodeValue = childNode.getFirstChild().getNodeValue();
}
adCodeList.add(checkNull(childNodeValue));
}
}
}
String adCode ="";
//adCode = checkNull(genericUtility.getColumnValue("ad_code", dom2)).trim();
adCode = checkNull(genericUtility.getColumnValue("ad_code", dom));
System.out.println("@S@ adCode >>>"+adCode);
String qtrNo = checkNull(genericUtility.getColumnValue("qtr_no", dom1));
emp_code__decl = checkNull(genericUtility.getColumnValue("emp_code__decl", dom1));
acct_prd = checkNull(genericUtility.getColumnValue("acct_prd", dom1));
//sql="select max(tran_id) as tran_id from emp_itdecl_hdr where emp_code__decl= ? and acct_prd= ?";
sql="select max(h.tran_id) as tran_id from emp_itdecl_hdr h,emp_itdecl_det d where " +
"h.tran_id = d.tran_id and h.emp_code__decl= ? and h.acct_prd = ? and h.qtr_no = ? and d.ad_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, emp_code__decl);
pstmt.setString(2, acct_prd);
pstmt.setString(3, qtrNo);
pstmt.setString(4, adCode);
rs = pstmt.executeQuery();
if(rs.next())
{
tranIdLast = checkNull(rs.getString("tran_id"));
System.out.println("@S@tranIdLast["+tranIdLast+"]");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(tranIdLast!= null && tranIdLast.trim().length()>0)
{
/*sql=" select ad_code from emp_itdecl_det where tran_id= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdLast);
rs = pstmt.executeQuery();
while(rs.next())
{
adCodeList.add(rs.getString("ad_code"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
boolean isAdCodeAdded = false;
StringBuffer adCodeXmlString = new StringBuffer();
adCodeXmlString = new StringBuffer("<?xml version=\"1.0\" encoding=''?>\r\n<Root>\r\n<header>\r\n<editFlag>");
adCodeXmlString.append(editFlag).append("</editFlag>\r\n</header>\r\n");
//sql=" select amount_decl,amount_decl__old,amount_proof,amount_proof__old from emp_itdecl_det where tran_id= ? ";
sql=" select ad_code, amount_decl,amount_decl__old,amount_proof,amount_proof__old from emp_itdecl_det where tran_id= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdLast);
rs = pstmt.executeQuery();
while(rs.next())
{
adCode=rs.getString("ad_code");
if(!adCodeList.contains(adCode))
{
/*valueXmlString.append("<amount_decl><![CDATA[").append(rs.getString("amount_decl")).append("]]></amount_decl>");
valueXmlString.append("<amount_proof><![CDATA[").append(rs.getString("amount_proof")).append("]]></amount_proof>");
valueXmlString.append("<amount_proof__old><![CDATA[").append(rs.getString("amount_proof__old")).append("]]></amount_proof__old>");
valueXmlString.append("<amount_decl__old><![CDATA[").append(rs.getString("amount_decl__old")).append("]]></amount_decl__old>");*/
adCodeXmlString.append("<Detail2>\r\n");
adCodeXmlString.append("<ad_code><![CDATA[").append(rs.getString("ad_code")).append("]]></ad_code>\r\n");
adCodeXmlString.append("<amount_decl><![CDATA[").append(rs.getString("amount_decl")).append("]]></amount_decl>\r\n");
adCodeXmlString.append("<amount_proof><![CDATA[").append(rs.getString("amount_proof")).append("]]></amount_proof>\r\n");
adCodeXmlString.append("<amount_proof__old><![CDATA[").append(rs.getString("amount_proof__old")).append("]]></amount_proof__old>\r\n");
adCodeXmlString.append("<amount_decl__old><![CDATA[").append(rs.getString("amount_decl__old")).append("]]></amount_decl__old>\r\n");
adCodeXmlString.append("</Detail2>\r\n");
isAdCodeAdded = true;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
adCodeXmlString.append("</Root>\r\n");
if(isAdCodeAdded)
{
return adCodeXmlString.toString();
}
}
}
//Modified by santosh to set amount proof old while using uploading A17JSUN001 .END
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
} }
break; break;
...@@ -819,10 +1301,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -819,10 +1301,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
if(conn != null) {
conn.close();
conn = null;
}
if(rs != null) { if(rs != null) {
rs.close(); rs.close();
rs = null; rs = null;
...@@ -831,6 +1310,10 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -831,6 +1310,10 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(conn != null) {
conn.close();
conn = null;
}
System.out.println("Closed all Database Resource...!"); System.out.println("Closed all Database Resource...!");
} catch (Exception e) { } catch (Exception e) {
System.out.println("Exception in EJB["+this.getClass().getSimpleName()+"]::itemChanged::[" + e.getMessage()+"]"); System.out.println("Exception in EJB["+this.getClass().getSimpleName()+"]::itemChanged::[" + e.getMessage()+"]");
...@@ -898,10 +1381,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -898,10 +1381,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
int dom2Length = dom.getElementsByTagName("Detail2").getLength(); int dom2Length = dom.getElementsByTagName("Detail2").getLength();
if (count == 0) { if (count == 0) {
errString = getErrorString("", "VTITPOSV01", userId); // errString = getErrorString("", "VTITPOSV01", userId);
errString = itmDBAccessEJB.getErrorString("", "VTITPOSV01", userId,"",conn); // Modifies by Sana S on 06/08/2019
return errString; return errString;
} else if (count != dom2Length){ } else if (count != dom2Length){
errString = getErrorString("", "VTITPOSV01", userId); //errString = getErrorString("", "VTITPOSV01", userId);
errString = itmDBAccessEJB.getErrorString("", "VTITPOSV01", userId,"",conn);// Modifies by Sana S on 06/08/2019
return errString; return errString;
} else{ } else{
System.out.println("DOM and INSERT have same records.. \\123456789"); System.out.println("DOM and INSERT have same records.. \\123456789");
...@@ -961,7 +1446,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -961,7 +1446,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
amountProof = rs.getDouble("AMOUNT_PROOF"); amountProof = rs.getDouble("AMOUNT_PROOF");
amountDeclOld = rs.getDouble("AMOUNT_DECL__OLD"); amountDeclOld = rs.getDouble("AMOUNT_DECL__OLD");
amountProofOld = rs.getDouble("AMOUNT_PROOF__OLD"); amountProofOld = rs.getDouble("AMOUNT_PROOF__OLD");
System.out.println("@S@adCode ....["+adCode+"acctPrd...."+acctPrd);
pstmt1.setString(1, empCode); pstmt1.setString(1, empCode);
pstmt1.setString(2, acctPrd); pstmt1.setString(2, acctPrd);
...@@ -972,7 +1457,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -972,7 +1457,7 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
if (rs1.next()) { if (rs1.next()) {
amountOrg = rs1.getDouble("AMOUNT"); amountOrg = rs1.getDouble("AMOUNT");
proofAmtOrg = rs1.getDouble("AMOUNT_PROOF"); proofAmtOrg = rs1.getDouble("AMOUNT_PROOF");
System.out.println("@S@amountDeclOld["+amountDeclOld+"][amountProofOld]["+amountProofOld+"]");
if(amountDeclOld == amountOrg && amountProofOld == proofAmtOrg) { if(amountDeclOld == amountOrg && amountProofOld == proofAmtOrg) {
if (amountDecl != amountOrg || amountProof != proofAmtOrg) { if (amountDecl != amountOrg || amountProof != proofAmtOrg) {
updateSql = "UPDATE EMP_IT_DECLARATION SET TRAN_DATE = ?, AMOUNT = ?, AMOUNT_OLD = ?, AMOUNT_PROOF = ?, AMOUNT_PROOF_OLD = ?, " updateSql = "UPDATE EMP_IT_DECLARATION SET TRAN_DATE = ?, AMOUNT = ?, AMOUNT_OLD = ?, AMOUNT_PROOF = ?, AMOUNT_PROOF_OLD = ?, "
...@@ -1016,7 +1501,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -1016,7 +1501,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
} else { } else {
System.out.println("Record Mismatch OLD DECL[" + amountDeclOld +"] DECL from IT_DECLARATION["+ amountOrg +"]OLD PROOF["+ amountProofOld +"]PROOF from IT_DECLARATION["+ proofAmtOrg + "]"); System.out.println("Record Mismatch OLD DECL[" + amountDeclOld +"] DECL from IT_DECLARATION["+ amountOrg +"]OLD PROOF["+ amountProofOld +"]PROOF from IT_DECLARATION["+ proofAmtOrg + "]");
errString = getErrorString("", "VTIVDEPRUP", userId); //errString = getErrorString("", "VTIVDEPRUP", userId);
errString = itmDBAccessEJB.getErrorString("", "VTIVDEPRUP", userId,"",conn); //Modified by Sana S on 06/08/2019
conn.rollback(); conn.rollback();
break; break;
} }
...@@ -1299,7 +1785,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -1299,7 +1785,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
String updateFlag = ""; String updateFlag = "";
if(detailNodeLength <= 0) { if(detailNodeLength <= 0) {
errCode = "VTINVDET"; errCode = "VTINVDET";
errString = getErrorString("", errCode, userId); //errString = getErrorString("", errCode, userId);
errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);//Modified by Sana S on 06/08/2019
return errString; return errString;
} else if(detailNodeLength > 0) { } else if(detailNodeLength > 0) {
for (int cnt = 0; cnt < detailNodeLength; cnt++) { for (int cnt = 0; cnt < detailNodeLength; cnt++) {
...@@ -1313,10 +1800,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -1313,10 +1800,12 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
cNodeName = cNodeName == null ? "" : cNodeName.trim(); cNodeName = cNodeName == null ? "" : cNodeName.trim();
if ("attribute".equalsIgnoreCase(cNodeName)) { if ("attribute".equalsIgnoreCase(cNodeName)) {
updateFlag = cNode.getAttributes().getNamedItem("updateFlag").getNodeValue(); updateFlag = cNode.getAttributes().getNamedItem("updateFlag").getNodeValue();
System.out.print("Update Flage:"+updateFlag);
updateFlag = updateFlag == null ? "" : updateFlag.trim(); updateFlag = updateFlag == null ? "" : updateFlag.trim();
if ("D".equalsIgnoreCase(updateFlag)) { if ("D".equalsIgnoreCase(updateFlag)) {
errCode = "VTCDELDET"; errCode = "VTCDELDET";
errString = getErrorString("", errCode, userId); // errString = getErrorString("", errCode, userId);
errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);//Modified by Sana S on 06/08/2019
return errString; return errString;
} }
} }
...@@ -1327,13 +1816,19 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -1327,13 +1816,19 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
System.out.println("Cam in Add Mode"); System.out.println("Cam in Add Mode");
if(detailNodeLength == 0) { if(detailNodeLength == 0) {
errCode = "VTINVDET"; errCode = "VTINVDET";
errString = getErrorString("", errCode, userId); //errString = getErrorString("", errCode, userId);
errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);//Modified by Sana S on 06/08/2019
return errString; return errString;
} else { } else {
String pay_site = genericUtility.getColumnValue("pay_site", dom, "1"); String pay_site = genericUtility.getColumnValue("pay_site", dom, "1");
String cadre = genericUtility.getColumnValue("cadre", dom, "1"); String cadre = genericUtility.getColumnValue("cadre", dom, "1");
String grade = genericUtility.getColumnValue("grade", dom, "1"); String grade = genericUtility.getColumnValue("grade", dom, "1");
String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", new Timestamp(Calendar.getInstance().getTimeInMillis()), conn); //Modified by Ahmed on 29/NOV/2017[A17HSUN004]start
String acctPrd = checkNull(genericUtility.getColumnValue("acct_prd", dom, "1"));
Timestamp acctFromDate = getAcctFromDate(acctPrd, conn);
//String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", new Timestamp(Calendar.getInstance().getTimeInMillis()), conn);
String admEnv = admCommon.getAdmEnv(pay_site, cadre, grade, "AD_CODE_DECL_TYPE", acctFromDate, conn);
//Modified by Ahmed on 29/NOV/2017[A17HSUN004]end
int sqlCount = 0; int sqlCount = 0;
if("NULLFOUND".equalsIgnoreCase(admEnv)) { if("NULLFOUND".equalsIgnoreCase(admEnv)) {
admEnv = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn); admEnv = admCommon.getEnv("999999", "AD_CODE_DECL_TYPE", conn);
...@@ -1359,7 +1854,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -1359,7 +1854,8 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
if(sqlCount != detailNodeLength) { if(sqlCount != detailNodeLength) {
System.out.println("Deleted some ad_code manually in ADD Mode: Count from sql:[" + sqlCount + "] from dom[" + detailNodeLength + "]"); System.out.println("Deleted some ad_code manually in ADD Mode: Count from sql:[" + sqlCount + "] from dom[" + detailNodeLength + "]");
errCode = "VTCDELDET"; errCode = "VTCDELDET";
errString = getErrorString("", errCode, userId); //errString = getErrorString("", errCode, userId);
errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);//Modified by Sana S on 06/08/2019
return errString; return errString;
} }
...@@ -1383,4 +1879,6 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo ...@@ -1383,4 +1879,6 @@ public class ITDeclarationIC extends ValidatorEJB implements ITDeclarationICRemo
} }
return errString; return errString;
} }
} }
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