1) Changes Done in PayrollSplitgenAccPrc.java to add setter methods

2) Changes done in PayStruChgReqConfirm.java to set respective entity code of HR/Emp in send mail 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217634 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/src/ibase/webitm/ejb/adm/PayrollSplitgenAccPrc.java

@@ -44,13 +44,17 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 	String cPaySite = "", cPayTable = "", cFinEnt = "";
 	String popstat = "N", arrgen = "N";
 	String isLogLocationType = "N";
-	String isPayarrProc = "N" , isItaxproc = "N";
+	String isPayarrProc = "N" ;
 	// Added by Poonam B [21/11/2019][START]
 	private String isCaller = "SELF";
 	private  String isOwrite = "N";
 	private String isFilename = "c:\\appl\\itm26\\pay_err.log";
 	private String isSingle = "N";
 	private String isProcId = "PayrollProcess";
+	private String isItaxProc = "N";
+	private String isEmpStatusType = "B";
+	private Timestamp idItaxFrdt = null;
+	private Timestamp idItaxTodt = null;
 	
 	public String getIsCaller() {
 		return isCaller;
@@ -91,6 +95,25 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 		this.isProcId = isProcId;
 	}
 	//Added by Poonam B [21/11/2019][END]
+
+	public void setIsItaxProc(String asIsItaxProc) 
+	{
+		this.isItaxProc = asIsItaxProc;
+	}
+
+	public void setIsEmpStatusType(String asIsEmpStatusType) 
+	{
+		this.isEmpStatusType = asIsEmpStatusType;
+	}
+	public void setIdItaxFrdt(Timestamp adIdItaxFrdt) 
+	{
+		this.idItaxFrdt = adIdItaxFrdt;
+	}
+	public void setIdItaxTodt(Timestamp adIdItaxTodt) 
+	{
+		this.idItaxTodt = adIdItaxTodt;
+	}
+
 	String idSetDateStr = "";
 	Timestamp idStatusDate = null, lDate = null; 
 	String runMode = "V";
@@ -215,7 +238,7 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 		LinkedHashMap dataSqlMap = null;
 		long owrite = 0;
 		Timestamp frDateAcc = null, idItaxTodt = null;
-		String lsPayTable = "", lsProjPaytable = "", isEmpStatusType = "B";
+		String lsPayTable = "", lsProjPaytable = "";
 		int count = 0, runPrd = 0, cntInner = 0, totRows = 0;
 		ITMDBAccessEJB itmDb = new ITMDBAccessEJB();
 		Timestamp mRelieveDate = null, dateJoin = null, ldRetirementDate = null;
@@ -699,9 +722,9 @@ public class PayrollSplitgenAccPrc extends ProcessEJB implements PayrollSplitgen
 						}
 					}
 					
-					if("PP".equalsIgnoreCase(type) && "Y".equalsIgnoreCase(isItaxproc) && idItaxTodt != null && (("A".equalsIgnoreCase(isEmpStatusType) && mRelieveDate != null && (mRelieveDate.before(idItaxTodt) || mRelieveDate.equals(idItaxTodt))) || ("R".equalsIgnoreCase(isEmpStatusType) && (mRelieveDate == null || mRelieveDate.after(idItaxTodt)))))
+					if("PP".equalsIgnoreCase(type) && "Y".equalsIgnoreCase(isItaxProc) && idItaxTodt != null && (("A".equalsIgnoreCase(isEmpStatusType) && mRelieveDate != null && (mRelieveDate.before(idItaxTodt) || mRelieveDate.equals(idItaxTodt))) || ("R".equalsIgnoreCase(isEmpStatusType) && (mRelieveDate == null || mRelieveDate.after(idItaxTodt)))))
 					{
-						System.out.println("\"PP\".equalsIgnoreCase(type) && \"Y\".equalsIgnoreCase(isItaxproc) && idItaxTodt != null && ((\"A\".equalsIgnoreCase(isEmpStatusType) && mRelieveDate != null && (mRelieveDate.before(idItaxTodt) || mRelieveDate.equals(idItaxTodt))) || (\"R\".equalsIgnoreCase(isEmpStatusType) && (mRelieveDate == null || mRelieveDate.after(idItaxTodt)))) is true");
+						System.out.println("\"PP\".equalsIgnoreCase(type) && \"Y\".equalsIgnoreCase(isItaxProc) && idItaxTodt != null && ((\"A\".equalsIgnoreCase(isEmpStatusType) && mRelieveDate != null && (mRelieveDate.before(idItaxTodt) || mRelieveDate.equals(idItaxTodt))) || (\"R\".equalsIgnoreCase(isEmpStatusType) && (mRelieveDate == null || mRelieveDate.after(idItaxTodt)))) is true");
 						continue;
 					}
 

webitm-adm/src/ibase/webitm/ejb/adm/adv/PayStruChgReqConfirm.java

@@ -772,6 +772,7 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 		boolean isMailSend = false;
 		String mailToAddress = "";
 		String mailCCAddress = "";
+		String emailEntityCode = ""; // Modified by Piyush on 06/03/2020
 
 
 		try
@@ -815,6 +816,7 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 			if (mailTo != null && mailTo.equalsIgnoreCase("EMP"))
 			{
 				mailToAddress = employeeMail;
+				emailEntityCode = empCode; // Modified by Piyush on 06/03/2020
 			}
 			if(ccTo != null && ccTo.equalsIgnoreCase("EMP"))
 			{
@@ -855,6 +857,7 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 								if (mailToAddress == null || mailToAddress.trim().length() == 0)
 								{
 									mailToAddress = email.trim();
+									emailEntityCode = empCodeHr; // Modified by Piyush on 06/03/2020
 								}
 								else
 								{
@@ -882,7 +885,9 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 				{
 					//isMailSend = sendMail(transInfoXml, "PYALOC","pay_stru_chg_req_wiz",Tranid,"PYALCCONFM", "E", empCodeHr,email,employeeMail, conn);
 					//isMailSend = sendMail(transInfoXml, "PYALOC","pay_stru_chg_req_wiz",tranId, mailFormatCode, "E", empCodeHr,email,employeeMail, conn);
-					isMailSend = sendMail(transInfoXml, "PYALOC","pay_stru_chg_req_hr_wiz",tranId, mailFormatCode, "E", empCode,mailToAddress,mailCCAddress, conn);
+					// Modified by Piyush on 06/03/2020
+					// isMailSend = sendMail(transInfoXml, "PYALOC","pay_stru_chg_req_hr_wiz",tranId, mailFormatCode, "E", empCode,mailToAddress,mailCCAddress, conn);
+					isMailSend = sendMail(transInfoXml, "PYALOC","pay_stru_chg_req_hr_wiz",tranId, mailFormatCode, "E", emailEntityCode, mailToAddress, mailCCAddress, conn);
 					if(isMailSend)
 					{
 						MailCnt++;