Commit ff348a3e authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 07/11/19

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211475 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 50aa1bc1
...@@ -38,6 +38,9 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -38,6 +38,9 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
HRLogWriter hrLogWriter = null; HRLogWriter hrLogWriter = null;
UtilMethods utilMethods = new UtilMethods(); UtilMethods utilMethods = new UtilMethods();
String isCaller = "SELF"; String isCaller = "SELF";
//added by Sana S on 06/11/19[start]
int totConfRec = 0 , totRejRec = 0,totFinRec=0;
//added by Sana S on 06/11/19[end]
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
public String getData(String xmlString, String xmlString2, String xtraParams) throws RemoteException,ITMException public String getData(String xmlString, String xmlString2, String xtraParams) throws RemoteException,ITMException
{ {
...@@ -338,6 +341,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -338,6 +341,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
conn.rollback(); conn.rollback();
} }
catch(Exception d) {throw new ITMException(d);} catch(Exception d) {throw new ITMException(d);}
throw new ITMException(e);
} }
finally finally
{ {
...@@ -378,7 +382,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -378,7 +382,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
Document detailDom = null; Document detailDom = null;
Document headerDom = null; Document headerDom = null;
Connection conn = null; Connection conn = null;
String retStr = ""; String retStr = "",errMsg="";
//Modified by Rohini T on 29/08/19[Start] //Modified by Rohini T on 29/08/19[Start]
String userId = ""; String userId = "";
String chgTerm = ""; String chgTerm = "";
...@@ -416,9 +420,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -416,9 +420,10 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//retStr = process(headerDom, detailDom, xtraParams,conn); //retStr = process(headerDom, detailDom, xtraParams,conn);
retStr = process(headerDom, detailDom, xtraParams,hrLogWriter,conn,logConn); retStr = process(headerDom, detailDom, xtraParams,hrLogWriter,conn,logConn);
System.out.println("Process for PerkClaimWOLoanAdjPrc ::"+retStr); System.out.println("Process for PerkClaimWOLoanAdjPrc ::"+retStr);
//Modified by Sana S on 06/11/19 [start]
gbfDestructProcess(headerDom,hrLogWriter, logConn);
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
if ((retStr != null && retStr.trim().length() > 0) && (retStr.indexOf("Errors") != -1)) //Error /*if ((retStr != null && retStr.trim().length() > 0) && (retStr.indexOf("Errors") != -1)) //Error
{ {
isError = true; isError = true;
return retStr; return retStr;
...@@ -429,7 +434,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -429,7 +434,8 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
retStr = itmDBAccessEJB.getErrorString("","VPPRKWPRS9","","",conn);//Success retStr = itmDBAccessEJB.getErrorString("","VPPRKWPRS9","","",conn);//Success
isError = false; isError = false;
return retStr; return retStr;
} } */
//Modified by Sana S on 06/11/19 [end]
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -443,6 +449,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -443,6 +449,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
{ {
throw new ITMException(d); throw new ITMException(d);
} }
throw new ITMException(e);
} }
finally finally
{ {
...@@ -458,6 +465,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -458,6 +465,14 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
conn.close(); conn.close();
conn = null; conn = null;
} }
//Added by Varsha V on 01/11/19 [start]
if(logConn != null)
{
logConn.commit();
logConn.close();
logConn = null;
}
//Added by Varsha V on 01/11/19 [end]
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -465,13 +480,23 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -465,13 +480,23 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
throw new ITMException(e); throw new ITMException(e);
} }
} }
//Added by Sana S on 06/11/19 [start]
errMsg = "\n noof_confirmed are ["+hrLogWriter.getRowsProcessed()+"] \n noof_rejected are ["+hrLogWriter.getRowsRejected()+"]";
try {
retStr = getError(errMsg,retStr,conn);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
//Added by Sana S on 06/11/19 [end]
return retStr; return retStr;
}//END OF PROCESS (1) }//END OF PROCESS (1)
//Modified by Rohini T on 29/08/19[Start] //Modified by Rohini T on 29/08/19[Start]
//public String process(Document headerDom, Document detailDom, String xtraParams,Connection conn) throws RemoteException,ITMException //public String process(Document headerDom, Document detailDom, String xtraParams,Connection conn) throws RemoteException,ITMException
public String process(Document headerDom, Document detailDom, String xtraParams,HRLogWriter hrLogWriter,Connection conn,Connection logConn) throws RemoteException,ITMException public String process(Document headerDom, Document detailDom, String xtraParams,HRLogWriter hrLogWriter,Connection conn,Connection logConn) throws Exception
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
{ {
String errMsg="";// Added by Sana S on 06/11/19
NodeList parentNodeList = null; NodeList parentNodeList = null;
NodeList childNodeList = null; NodeList childNodeList = null;
Node parentNode = null; Node parentNode = null;
...@@ -513,7 +538,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -513,7 +538,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
String siteCodeFr="",siteCodeTo=""; String siteCodeFr="",siteCodeTo="";
//Added by sana s on 18/10/19 [end] //Added by sana s on 18/10/19 [end]
try try
{ {
//Added by Sana S on 05/11/19 [start]
setNodeValue(headerDom, "noof_confirmed", "0");
setNodeValue(headerDom, "noof_rejected", "0");
//Added by Sana S on 05/11/19 [end]
//Modified by Rohini T on 29/08/19[Start] //Modified by Rohini T on 29/08/19[Start]
hrLogWriter.setCurrentProcess("PerkClaimWOLoanAdj"); hrLogWriter.setCurrentProcess("PerkClaimWOLoanAdj");
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
...@@ -1414,34 +1444,66 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1414,34 +1444,66 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
return errString; return errString;
} }
//Modified by Rohini T on 29/08/19[Start] /*else
else
{ {
hrLogWriter.gbfErrWrite("", lsEmpCode, "", "Process Complete", "I", 1, logConn); hrLogWriter.gbfErrWrite("", lsEmpCode, "", "Process Complete", "I", 1, logConn);
} }*/
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
}//For Loop to get Selected Details Data Values [START] }//For Loop to get Selected Details Data Values [START]
//Added by sarita on 26 APRIL 2019 [START] //Added by sarita on 26 APRIL 2019 [START]
System.out.println("errString ["+errString+"] \t headerHashMap ["+headerHashMap+"] \t voucherDetdata ["+detailHashMap+"]"); System.out.println("errString ["+errString+"] \t headerHashMap ["+headerHashMap+"] \t voucherDetdata ["+detailHashMap+"]");
if(errString == null || errString.trim().length() == 0) if(errString == null || errString.trim().length() == 0)
{ { //Modified by Sana S on 06/11/19 [start]
errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,conn); //errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,conn, logConn);
errString = getHashMapValDiff(headerHashMap , detailHashMap,xtraParams,hrLogWriter,conn, logConn);
//Modified by Sana S on 06/11/19 [end]
//Modified by Rohini T on 29/08/19[Start] //Modified by Rohini T on 29/08/19[Start]
if(errString != null && errString.trim().length() > 0) //Modified by Sana S on 06/11/19 [start]
//if(errString != null && errString.trim().length() > 0 )
if((errString != null && errString.trim().length() > 0 ) && (!(errString.contains("VPSUCC1"))))
//Modified By sana s on 06/11/19 [end]
{ {
headerDom = genericUtility.parseString(errString); //Commented by Sana S on 05/11/19 [start]
/*headerDom = genericUtility.parseString(errString);
detailList = headerDom.getElementsByTagName("error"); detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0); currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue(); currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId); System.out.println("currErrorId getting from errString:::: " + currErrorId);
hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn); hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn);
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime //errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn); errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);*/
return errString; //Commented by Sana S on 05/11/19 [end]
//Added by Sana S on 04/11/19 [start]
totRejRec = totRejRec + 1;
System.out.print("totRejRec>>>>>"+totRejRec);
isError = true;
//return errString;
////Added by Sana S on 04/11/19 [end]
} }
//Added by Sana S on 04/11/19
else
{
totConfRec = totConfRec + 1;
System.out.print("totConfRec>>>>>"+totConfRec);
isError = false;
}
//end
//Modified by Rohini T on 29/08/19[End]
//Added by Sana S on 04/11/19 [start]
setNodeValue(headerDom, "noof_confirmed", String.valueOf(totConfRec));
setNodeValue(headerDom, "noof_rejected", String.valueOf(totRejRec));
//Added by Sana S on 04/11/19 [end]
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
} }
//Added by Sana S on 06/11/19 [start]
totFinRec = totConfRec + totRejRec;
//Added by Sana S on 06/11/19 [end]
//Added by sarita on 26 APRIL 2019 [END] //Added by sarita on 26 APRIL 2019 [END]
} }
catch(Exception e) catch(Exception e)
...@@ -1484,6 +1546,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1484,6 +1546,7 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
} }
} }
System.out.println("Error Message=>"+errString.toString()); System.out.println("Error Message=>"+errString.toString());
return errString; return errString;
}//END OF PROCESS(2) }//END OF PROCESS(2)
...@@ -1576,6 +1639,32 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -1576,6 +1639,32 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
} }
return AttribValue; return AttribValue;
} }
///Added by Sana S on 06/11/19 [start]
private String getError(String errMsg, String Code, Connection conn) throws ITMException, Exception
{
String mainStr ="";
try
{
String errString = "";
errString = new ITMDBAccessEJB().getErrorString("",Code,"","",conn);
System.out.println("Origional ErrorString is =====> <"+errString+">");
String begPart = errString.substring(0,errString.indexOf("</description>"));
String endDesc = errString.substring(errString.indexOf("</description>"),errString.length());
System.out.println("begPart ["+begPart+"] \t endDesc ["+endDesc+"]");
mainStr = checkNullAndTrim(begPart) + errMsg + checkNullAndTrim(endDesc);
System.out.println("mainStr:::::::::::::::::: "+mainStr);
//begPart = null;
//mainStr = errString;
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
return mainStr;
}
//Added by Sana S on 06/11/19 [end]
// Method [getAttributeVal] --- END // Method [getAttributeVal] --- END
// Method [getErrorXml] --- START // Method [getErrorXml] --- START
...@@ -3052,12 +3141,21 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -3052,12 +3141,21 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
} }
//Added by sarita on 26 APRIL 2019 [START] //Added by sarita on 26 APRIL 2019 [START]
private String getHashMapValDiff(HashMap<String,HashMap> data1 , HashMap<String, HashMap<String, Double>> voucherDetdata,String xtraParams,Connection conn) throws ITMException //Modified by Sana S on 06/11/19 [start]
//private String getHashMapValDiff(HashMap<String,HashMap> data1 , HashMap<String, HashMap<String, Double>> voucherDetdata,String xtraParams,Connection conn, Connection logConn) throws ITMException
private String getHashMapValDiff(HashMap<String,HashMap> data1 , HashMap<String, HashMap<String, Double>> voucherDetdata,String xtraParams,HRLogWriter hrLogWriter,Connection conn, Connection logConn) throws ITMException
//Modified by Sana S on 06/11/19 [end]
{ {
String errString = ""; String errString = "";
HashMap hedrData = new HashMap(); HashMap hedrData = new HashMap();
HashMap detlData = new HashMap(); HashMap detlData = new HashMap();
ArrayList hashList = new ArrayList(); ArrayList hashList = new ArrayList();
//Added by Varsha V on 01/11/19 [start]
NodeList detailList = null;
Node currDetail = null;
String currErrorId = "",errMsg="";
Document headerDom = null;
//Added by Varsha V on 01/11/19 [end]
try try
{ {
System.out.println("******** Inside Method getHashMapValDiff *********** "); System.out.println("******** Inside Method getHashMapValDiff *********** ");
...@@ -3083,7 +3181,24 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -3083,7 +3181,24 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
{ {
//errString = itmDBAccessEJB.getErrorString("","DS000","","",conn); //errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
return errString; //Added by Varsha V on 01/11/19 [start]
headerDom = genericUtility.parseString(errString);
detailList = headerDom.getElementsByTagName("error");
currDetail = detailList.item(0);
currErrorId = currDetail.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("currErrorId getting from errString:::: " + currErrorId);
hrLogWriter.gbfErrWrite("", "", "", currErrorId, "E", 2, logConn);
//errString = itmDBAccessEJB.getErrorString("",erroCode,"","",conn);//Claimed amount should be same as balance amount in case of full claime
//Commented by Sana S on 05/11/19 [start]
errString = itmDBAccessEJB.getErrorString("",currErrorId,"","",conn);
return errString;
//Commented by Sana S on 05/11/19 [end]
}
else
{
errString = "VPSUCC1";//added by Sana S on 06/11/19
hrLogWriter.gbfErrWrite("", key, "", "Process Complete", "I", 1, logConn);
//Added by Varsha V on 01/11/19 [end]
} }
hashList.clear(); hashList.clear();
} }
...@@ -3094,10 +3209,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo ...@@ -3094,10 +3209,12 @@ public class PerkClaimWOLoanAdjPrc extends ProcessEJB implements PerkClaimWOLo
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
return errString; return errString;
} }
//Added by sarita on 26 APRIL 2019 [END] //Added by sarita on 26 APRIL 2019 [END]
//Modified by Rohini T on 29/08/19[Start]
private String checkNull(String input) private String checkNull(String input)
{ {
return (input == null)? "" : input ; return (input == null)? "" : input ;
......
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