Skip to content

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

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

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@207735 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 173adb0d
Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 172 deletions
webitm-adm/src/ibase/webitm/ejb/adm/ShiftProcess.java
View file @ b5e6e643
/*
Window Name : w_sordalloc
*/
*/
package ibase.webitm.ejb.adm;
import java.rmi.RemoteException;
import java.util.*;
import java.sql.*;
import java.sql.Date;
import java.text.SimpleDateFormat;
import org.w3c.dom.*;
import javax.ejb.*;
import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.adm.ShiftProcess.EmpInfo;
//import ibase.webitm.utility.GenericUtility;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
......@@ -36,7 +38,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
java.sql.Timestamp dueDate = null;
java.sql.Timestamp dateFr = null;
java.sql.Date toDay = null;
java.util.Date fromPrdDate = null;
java.util.Date toPrdDate = null;
......@@ -47,6 +49,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Azhar on [06-Sep-2019][As per new framework][End]
ITMDBAccessEJB itmDBAccessEJB=new ITMDBAccessEJB();
CommonConstants commonConstants = new CommonConstants();
String chgUser = null;
......@@ -54,8 +58,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//Changed by Dhiraj req ID: AD01SUN008 [05/10/10].start
//ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
/*public void ejbCreate() throws RemoteException, CreateException
/*public void ejbCreate() throws RemoteException, CreateException
{
try
{
......@@ -78,7 +82,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
public void ejbPassivate()
{
}
*/
*/
//Changed by Dhiraj req ID: AD01SUN008 [05/10/10].end
public String process() throws RemoteException,ITMException
{
......@@ -126,7 +130,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//Modified by Azhar on[06-Sep-2019][To invoke process method from Events Affecting Confirmation][Start]
//rtrStr = process(headerDom, detailDom, windowName, xtraParams);
rtrStr = process(headerDom, detailDom, windowName, xtraParams,conn);
System.out.println("rtrStr :"+rtrStr);
if(rtrStr == null || rtrStr.trim().length() == 0)
{
conn.commit();
......@@ -136,6 +140,19 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
conn.rollback();
return rtrStr;
}
////
/*if(rtrStr != null && rtrStr.trim().length() > 0)
{
rtrStr = itmDBAccessEJB.getErrorString("", rtrStr, "", "", conn);
conn.rollback();
}
if(rtrStr == null || rtrStr.trim().length() == 0)
{
conn.commit();
rtrStr = itmDBAccessEJB.getErrorString("", "VTCONF", userId, "", conn);
return rtrStr;
}*/
////
//Modified by Azhar on[06-Sep-2019][To invoke process method from Events Affecting Confirmation][End]
}
catch (Exception e)
......@@ -165,7 +182,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//Modified by Azhar on[06-Sep-2019][To invoke process method from Events Affecting Confirmation][End]
return rtrStr;
}
//Modified by Azhar on[06-Sep-2019][To invoke process method from Events Affecting Confirmation][Start]
//public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams,Connection conn) throws RemoteException,ITMException
......@@ -228,7 +245,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
java.util.Date toDate1 = null;
java.util.Date tmpTo1 = null;
java.util.Date tmpFr1 = null;
String prdCode = "";
String patternCodeFilt = "";
int patternDays = 0;
......@@ -242,7 +259,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
String holiTblNo =null;
int selectedLineNo = 0;
ArrayList empList = new ArrayList();
//added by Sana S on [18/09/2019]
SimpleDateFormat sdf1= new SimpleDateFormat("dd-MM-yy");
ArrayList<EmpInfo> empList = new ArrayList<EmpInfo>();
HashMap empEventsMap = new HashMap();
int shiftIndexFr = 0;//Added by jaimin on 16/06/2008 (AD89SUN014)
int shiftIndexTo = 0;//Added by Jaimin on 16/06/2008 (AD89SUN014)
......@@ -250,7 +270,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//Commented and added by Varsha V on 20-Jul-18 for removing lookup
//ITMDBAccessLocal itmdbAccessLocal = null;
ITMDBAccessEJB itmDBAccess = null;
try
{
//Changed by Dhiraj 06/10/10 [AD01SUN008].start
......@@ -262,9 +282,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
itmDBAccess = new ITMDBAccessEJB();
//Changed by Dhiraj 06/10/10 [AD01SUN008].end
//Commented by Azhar on[06-Sep-2019][Connection created in above method][Start]
//connDriver = new ConnDriver();
//Commented by Azhar on[06-Sep-2019][Connection created in above method][End]
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
//connDriver = new ConnDriver();
//Commented by Azhar on[06-Sep-2019][Connection created in above method][End]
//SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd-MM-yy");//modified by Sana S on [18/09/2019]
//Commented by Azhar on[06-Sep-2019][Shifted in above method][Start]
//conn = connDriver.getConnectDB("DriverITM");
//Commented by Azhar on[06-Sep-2019][Shifted in above method][End]
......@@ -276,14 +297,15 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
//termId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termID"); //COMMENTED BY ALKA 25/07/07 AS VARIABLE termID CHANGED TO GLOBAL VARIABLE chgTerm
//chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termID");//Gulzar - 07/10/10 termID value pass as 'BASE'
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");//Gulzar - 07/10/10
//chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"chgTerm");//Gulzar - 07/10/10
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));//Sana S on 17/09/2019
}
Node hdrNode = null;
NodeList detailList = null;
detailList = headerDom.getElementsByTagName( "Header" );
selectedLineNo = 0;
//getting header data to be inserted
hdrNode = detailList.item( selectedLineNo );
......@@ -295,7 +317,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
if( chgTerm == null || chgTerm.trim().length() == 0 )
{
chgTerm = (String)genericUtility.getColumnValueFromNode( "chg_term", hdrNode );
//chgTerm = (String)genericUtility.getColumnValueFromNode("chg_term", hdrNode);
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
System.out.print("chgTerm:"+chgTerm);
}
toDay = new java.sql.Date(System.currentTimeMillis());
......@@ -335,10 +359,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{
siteCodeTo = "ZZ";
}
patternCodeFilt = genericUtility.getColumnValue("pattern_code",headerDom);
fromDate = genericUtility.getColumnValue("date__fr",headerDom);
System.out.println(" From Date [" +fromDate+"]");
//Changed by Pawan on 5/11/2011 [AD01SUN008].start
if ( fromDate == null || fromDate.length() <= 0 )
......@@ -354,7 +378,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
if( xtraParams.indexOf("user_lang=") <= 0 )
{
//fromDate = genericUtility.getValidDateString(fromDate, "yy-MM-dd" , genericUtility.getApplDateFormat());
fromDate = genericUtility.getValidDateString(fromDate, "dd/MM/yy" , genericUtility.getApplDateFormat());
fromDate = genericUtility.getValidDateString(fromDate, "dd-MM-yy" , genericUtility.getApplDateFormat());
System.out.println(" From Date1 [" +fromDate+"]");
}
}
//Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] End
......@@ -375,7 +400,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
if( xtraParams.indexOf("user_lang=") <= 0 )
{
//toDate = genericUtility.getValidDateString(fromDate, "yy-MM-dd" , genericUtility.getApplDateFormat());
toDate = genericUtility.getValidDateString(toDate, "dd/MM/yy" , genericUtility.getApplDateFormat());
toDate = genericUtility.getValidDateString(toDate, "dd-MM-yy" , genericUtility.getApplDateFormat());
}
}
//Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] End
......@@ -387,62 +412,84 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//getting date in sql date and dbdate format
String strFrDate = genericUtility.getValidDateString(fromDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
// SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yy");// Modified by Sana s o 18/09/2019
System.out.println("FromDate in DbDate Format :["+strFrDate+"]");
String strToDate = genericUtility.getValidDateString(toDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat());
System.out.println("To Date in Db Date Format:["+strToDate+"]");
java.util.Date frDate = sdf.parse(strFrDate);
fromPrdDate = frDate;
System.out.println("From Date Object :["+frDate+"]");
java.sql.Date frSqlDate = new java.sql.Date(frDate.getTime());
System.out.println("java.sql.Date From :["+frSqlDate+"]");
SimpleDateFormat sdt = new SimpleDateFormat(genericUtility.getApplDateFormat());
//SimpleDateFormat sdt = new SimpleDateFormat("dd-MM-yy");//Modified by Sana s on 18/09/2019
java.util.Date tDate = sdt.parse(strToDate);
toPrdDate = tDate;
System.out.println("To date Object :"+tDate);
java.sql.Date toSqlDate = new java.sql.Date(tDate.getTime());
System.out.println("java.sql.Date To : -["+toSqlDate+"]");
System.out.println(""
+ ""+toSqlDate+"]");
//end getting dates in sqldate and dbdate format
if (siteCodeFr != null )
{
//query changed by msalam on 170308 as it was unnecessary to call the query repeteadly
//Modified by Sana on 18/09/2019 [Start]
/*getDataSql = " SELECT e.EMP_CODE, e.EMP_FNAME, e.EMP_LNAME, e.WORK_SHIFT, e.SHIFT_ROT, e.HOL_TBLNO, "
+" e.cadre, e.grade, e.shift_Index, e.date_Join, e.PATTERN_CODE, e.WORK_SITE, ws.FROM_DT ,"
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002] [Fetching relieve date of employee][Start]
+"e.RELIEVE_DATE "
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002] [Fetching relieve date of employee][End]
+" FROM EMPLOYEE e, "
+" ( SELECT t.emp_code, t.FROM_DT FROM WORK_SHIFT t "
+" WHERE t.EMP_CODE >= '" + empCodeFr + "'"
+" AND t.EMP_CODE <= '" + empCodeFr + "'"
+" and ? BETWEEN FROM_DT AND TO_DT ) ws "
+" WHERE e.emp_code = ws.emp_code( + ) "
+" and e.EMP_CODE >= '" + empCodeFr + "'"
+" AND e.EMP_CODE <= '" + empCodeTo + "'"
+" AND DEPT_CODE >= '" + deptCodeFr + "'"
+" AND DEPT_CODE <= '" + deptCodeTo + "'"
+" AND WORK_SITE >= '" + siteCodeFr + "'"
+" AND WORK_SITE <= '" + siteCodeTo + "'"
+" AND SHIFT_ROT = 'Y' "
// Modified by Piyush on 31/10/2012 for not to fetch those employee whose joining date is beyound shift to date specified in argument
//+" AND nvl( status, ' ') <> 'S'";
+" AND nvl( status, ' ') <> 'S' AND e.date_Join <= ?";*/
getDataSql = " SELECT e.EMP_CODE, e.EMP_FNAME, e.EMP_LNAME, e.WORK_SHIFT, e.SHIFT_ROT, e.HOL_TBLNO, "
+" e.cadre, e.grade, e.shift_Index, e.date_Join, e.PATTERN_CODE, e.WORK_SITE, ws.FROM_DT ,"
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002] [Fetching relieve date of employee][Start]
+"e.RELIEVE_DATE "
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002] [Fetching relieve date of employee][End]
+" FROM EMPLOYEE e, "
+" ( SELECT t.emp_code, t.FROM_DT FROM WORK_SHIFT t "
+" WHERE t.EMP_CODE >= '" + empCodeFr + "'"
+" AND t.EMP_CODE <= '" + empCodeTo + "'"
+" and ? BETWEEN FROM_DT AND TO_DT ) ws "
+" WHERE e.emp_code = ws.emp_code( + ) "
+" and e.EMP_CODE >= '" + empCodeFr + "'"
+" AND e.EMP_CODE <= '" + empCodeTo + "'"
+" AND DEPT_CODE >= '" + deptCodeFr + "'"
+" AND DEPT_CODE <= '" + deptCodeTo + "'"
+" AND WORK_SITE >= '" + siteCodeFr + "'"
+" AND WORK_SITE <= '" + siteCodeTo + "'"
+" AND SHIFT_ROT = 'Y' "
// Modified by Piyush on 31/10/2012 for not to fetch those employee whose joining date is beyound shift to date specified in argument
//+" AND nvl( status, ' ') <> 'S'";
+" AND nvl( status, ' ') <> 'S' AND e.date_Join <= ?";
+" e.cadre, e.grade, e.shift_Index, e.date_Join, e.PATTERN_CODE, e.WORK_SITE, ws.FROM_DT ,"
+"e.RELIEVE_DATE FROM EMPLOYEE e, ( SELECT t.emp_code, t.FROM_DT FROM WORK_SHIFT t WHERE t.EMP_CODE >= '" + empCodeFr + "' "
+ "AND t.EMP_CODE <= '" + empCodeFr + "'and ? BETWEEN FROM_DT AND TO_DT ) ws "
+" WHERE e.emp_code = ws.emp_code( + ) and e.EMP_CODE = '" + empCodeFr + "' AND DEPT_CODE = '" + deptCodeFr + "' AND DEPT_CODE = '" + deptCodeTo + "'"
+" AND WORK_SITE = '" + siteCodeFr + "' AND WORK_SITE = '" + siteCodeTo + "'"
+" AND SHIFT_ROT = 'Y' AND nvl( status, ' ') <> 'S' AND e.date_Join <= ?";
//Modified by Sana S on 18/09/2019[end]
PreparedStatement pStmt = null;
System.out.println("\n\n getDataSql :"+getDataSql);
pStmt = conn.prepareStatement( getDataSql );
System.out.print("Parameters 1:: [" + frSqlDate+"]");
pStmt.setDate( 1, frSqlDate );
//pStmt.setDate( 1, frSqlDate );
pStmt.setString( 1, sdf1.format(frSqlDate));//Modified by Sana S on 18/09/2019
// Modified by Piyush on 31/10/2012 [for not to fetch those employee whose joining date is beyound shift to date specified in argument].Start
System.out.print("Parameters 1-1:: [" + toSqlDate+"]");
pStmt.setDate( 2, toSqlDate );
// Modified by Piyush on 31/10/2012 [for not to fetch those employee whose joining date is beyound shift to date specified in argument].End
rsn1 = pStmt.executeQuery( );
//pStmt.setDate( 2, toSqlDate );
pStmt.setString( 2, sdf1.format(toSqlDate)); //Modified by Sana S on 18/09/2019
// Modified by Piyush on 31/10/2012 [for not to fetch those employee whose joining date is beyound shift to date specified in argument].End
rsn1 = pStmt.executeQuery( );
while( rsn1.next() )
{
System.out.print("empList:");
EmpInfo empInfo = new EmpInfo();
empInfo.empCode = rsn1.getString( "EMP_CODE" );
empInfo.workShift = checkNull(rsn1.getString( "WORK_SHIFT" )).trim();
......@@ -458,16 +505,17 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
empInfo.relieveDate = rsn1.getDate( "RELIEVE_DATE" );
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Fetching relieve date of employee ][End]
empList.add( empInfo );
System.out.print("empList:"+empList);
}
rsn1.close();
rsn1 = null;
pStmt.close();
pStmt = null;
int noOfEmp = empList.size();
System.out.println("noOfEmp..........::"+noOfEmp);
java.sql.Date toSqlDate1 = getNextDate( toSqlDate );
for( int noOfEmpCnt = 0; noOfEmpCnt < noOfEmp; noOfEmpCnt++ )
......@@ -498,7 +546,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{
frSqlDate = frSqlDate1;
}
*/
*/
if(patternCodeFilt == null || patternCodeFilt.trim().length() == 0)
{
if( frSqlDate1 != null )
......@@ -513,6 +561,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
int updCnt = 0;
java.sql.Date reliDate = null;
reliDate = empInfo.relieveDate;
System.out.print("reliDate:"+reliDate);
if(reliDate != null && reliDate.compareTo(toSqlDate) < 0)
{
toSqlDate = (java.sql.Date)reliDate;
......@@ -520,10 +569,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
toSqlDate1 = getNextDate( toSqlDate );
System.out.println("java.sql.Date Next date To Date :["+toSqlDate1+"]");
updateSql = "UPDATE WORK_SHIFT SET TO_DT = ? WHERE EMP_CODE = '"+emp+"' "+
"AND ? BETWEEN FROM_DT AND TO_DT ";
"AND ? BETWEEN FROM_DT AND TO_DT ";
pstmtTemp = conn.prepareStatement(updateSql);
pstmtTemp.setDate( 1, toSqlDate );
pstmtTemp.setDate( 2, toSqlDate );
//Modified By Sana S on 18/09/2019 [start]
/*pstmtTemp.setDate( 1, toSqlDate );
pstmtTemp.setDate( 2, toSqlDate );*/
pstmtTemp.setString( 1, sdf1.format(toSqlDate) );
pstmtTemp.setString( 2, sdf1.format(toSqlDate ));
//Modified By Sana S on 18/09/2019 [end]
updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters();
if ( updCnt > 0 )
......@@ -533,9 +586,11 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
pstmtTemp.close();
pstmtTemp = null;
updateSql = "DELETE FROM WORK_SHIFT WHERE EMP_CODE = '"+emp+"' "+
"AND FROM_DT > ? ";
"AND FROM_DT > ? ";
pstmtTemp = conn.prepareStatement(updateSql);
pstmtTemp.setDate( 1, toSqlDate );
//pstmtTemp.setDate( 1, toSqlDate );
pstmtTemp.setString( 1, sdf1.format(toSqlDate) ); //Modified By Sana S on 18/09/2019
updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters();
if ( updCnt > 0 )
......@@ -548,7 +603,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{
continue;
}
}
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Not to generate shift beyond relieve date of employee][End]
......@@ -557,6 +612,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//Modified by Rupesh on [01/11/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Checking for joining date][Start]
java.sql.Date empJoinDt = (java.sql.Date)empInfo.dateJoin;
System.out.println("empInfo.dateJoin"+empJoinDt+"]");
System.out.println("frSqlDate:"+frSqlDate);
System.out.println("condition check:"+frSqlDate.compareTo(empJoinDt));
if (frSqlDate.compareTo(empJoinDt) < 0)
{
frSqlDate = (java.sql.Date)empJoinDt;
......@@ -565,7 +624,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
edShiftDate = frSqlDate;
}
//Modified by Rupesh on [01/11/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Checking for joining date][End]
ResultSet rsTmp = null;
int selCnt = 0;
java.sql.Date prevFrDate = null;
......@@ -574,11 +633,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
prevFrDate = getPrevDate(frSqlDate);
System.out.println("prevFrDate::"+prevFrDate);
updateSql = "UPDATE WORK_SHIFT SET TO_DT = ? WHERE EMP_CODE = '"+emp+"' "+
"AND ? BETWEEN FROM_DT AND TO_DT AND FROM_DT <> ? ";
"AND ? BETWEEN FROM_DT AND TO_DT AND FROM_DT <> ? ";
pstmtTemp = conn.prepareStatement(updateSql);
pstmtTemp.setDate( 1, prevFrDate );
pstmtTemp.setDate( 2, frSqlDate );
pstmtTemp.setDate( 3, frSqlDate );
//pstmtTemp.setDate( 1, prevFrDate );
pstmtTemp.setString( 1, sdf1.format(prevFrDate) );// Modified By Sana S on 18/09/2019
//pstmtTemp.setDate( 2, frSqlDate );
pstmtTemp.setString( 2, sdf1.format(frSqlDate));// Modified By Sana S on 18/09/2019
//pstmtTemp.setDate( 3, frSqlDate );
pstmtTemp.setString( 3, sdf1.format(frSqlDate ));// Modified By Sana S on 18/09/2019
updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters();
if ( updCnt > 0 )
......@@ -591,11 +653,17 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
nextToDate = getNextDate(toSqlDate);
System.out.println("nextToDate::"+nextToDate);
updateSql = "UPDATE WORK_SHIFT SET FROM_DT = ? WHERE EMP_CODE = '"+emp+"' "+
"AND ? BETWEEN FROM_DT AND TO_DT AND TO_DT <> ? ";
"AND ? BETWEEN FROM_DT AND TO_DT AND TO_DT <> ? ";
pstmtTemp = conn.prepareStatement(updateSql);
pstmtTemp.setDate( 1, nextToDate );
//Modified By Sana S on 18/09/2019[start]
/*pstmtTemp.setDate( 1, nextToDate );
pstmtTemp.setDate( 2, toSqlDate );
pstmtTemp.setDate( 3, toSqlDate );
pstmtTemp.setDate( 3, toSqlDate );*/
pstmtTemp.setString( 1, sdf1.format(nextToDate));
pstmtTemp.setString( 2, sdf1.format(toSqlDate));
pstmtTemp.setString( 3, sdf1.format(toSqlDate));
//Modified By Sana S on 18/09/2019[end]
updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters();
if ( updCnt > 0 )
......@@ -608,23 +676,27 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//End added Gulzar - 03/06/10[]
sql = "DELETE FROM WORK_SHIFT WHERE EMP_CODE = ? "
+"AND FROM_DT BETWEEN ? AND ? "
+"AND TO_DT BETWEEN ? AND ? ";
+"AND FROM_DT BETWEEN ? AND ? "
+"AND TO_DT BETWEEN ? AND ? ";
System.out.println("sql :"+sql);
pstmtn2 = conn.prepareStatement(sql);
pstmtn2.setString(1,emp);
pstmtn2.setDate(2,frSqlDate);
//pstmtn2.setDate(2,frSqlDate);
pstmtn2.setString(2,sdf1.format(frSqlDate));// Modified by Sana S on 18/9/2019
System.out.println("frSqlDate :-"+frSqlDate);
pstmtn2.setDate(3,toSqlDate);
//pstmtn2.setDate(3,toSqlDate);
pstmtn2.setString(3,sdf1.format(toSqlDate));// Modified by Sana S on 18/9/2019
System.out.println("toSqlDate :-"+toSqlDate);
pstmtn2.setDate(4,frSqlDate);
pstmtn2.setDate(5,toSqlDate);
//pstmtn2.setDate(4,frSqlDate);
pstmtn2.setString(4,sdf1.format(frSqlDate));// Modified by Sana S on 18/9/2019
//pstmtn2.setDate(5,toSqlDate);
pstmtn2.setString(5,sdf1.format(toSqlDate));// Modified by Sana S on 18/9/2019
upd = pstmtn2.executeUpdate();
System.out.println("No Of record deleted from WORK_SHIFT ["+upd+"]");
pstmtn2.close();
pstmtn2 = null;
patternCode = checkNull(empInfo.patternCode).trim();
workSite = empInfo.patternCode;
holiTblNo = empInfo.holTblno;
......@@ -635,23 +707,23 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
patternCode = patternCodeFilt;
}
ArrayList frPatternCodeList = new ArrayList();
ArrayList toPatternCodeList = new ArrayList();
ArrayList<String> frPatternCodeList = new ArrayList<String>();
ArrayList<String> toPatternCodeList = new ArrayList<String>();
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To Add index of pattern in ArrayList][Start]
ArrayList frShiftIndexList = new ArrayList();
ArrayList toShiftIndexList = new ArrayList();
ArrayList<String> frShiftIndexList = new ArrayList<String>();
ArrayList<String> toShiftIndexList = new ArrayList<String>();
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To Add index of pattern in ArrayList][End]
ArrayList effDateList = new ArrayList();
ArrayList<Date> effDateList = new ArrayList<Date>();
java.sql.Date effDate = new java.sql.Date(System.currentTimeMillis());
PreparedStatement patternPStmt = null;
ResultSet patternRs = null;
String lastPatternCodeStr = "";
String lastShiftIndexStr = ""; //Added by jaimin on 16/06/2008 (AD89SUN014)
lastShiftIndexStr = checkNull(empInfo.shiftIndex+"").trim(); //Added by jaimin on 16/06/2008 (AD89SUN014)
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To fetch only confirmed transaction and in proper order][Start]
/*
......@@ -660,14 +732,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
" CASE WHEN SHIFT_INDEX__TO IS NULL THEN 0 ELSE SHIFT_INDEX__TO END AS SHIFT_INDEX__TO "+
" FROM EMP_EMPLOY_EVENTS WHERE EMP_CODE = '"+emp+"' "+
" AND EFF_DATE BETWEEN ? AND ? ORDER BY EFF_DATE"; //Sql modify by jaimin on 16/06/2008 (AD89SUN014)
*/
*/
frPatternCodeList.add(empInfo.patternCode);
toPatternCodeList.add(empInfo.patternCode);
frShiftIndexList.add(lastShiftIndexStr);
toShiftIndexList.add(lastShiftIndexStr);
effDateList.add(empJoinDt);
//Modified by Prashant on [23/01/2013][To change the conditions for selecting values from database][Start]
/*
sql = "SELECT PATTERN_CODE__FR,PATTERN_CODE__TO,EFF_DATE, " +
......@@ -679,7 +751,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
"AND CONFIRMED = 'Y' AND (nvl(PATTERN_CODE__FR,' ') <> nvl(PATTERN_CODE__TO, ' ') or nvl(SHIFT_INDEX__FR,'0') <> nvl(SHIFT_INDEX__TO ,'0')) "+
"ORDER BY EFF_DATE DESC,CONF_DATE DESC,CHG_DATE DESC";
//Sql modify by jaimin on 16/06/2008 (AD89SUN014)
*/
*/
sql = "SELECT PATTERN_CODE__FR,PATTERN_CODE__TO,EFF_DATE, " +
" CASE WHEN SHIFT_INDEX__FR IS NULL THEN 0 ELSE SHIFT_INDEX__FR END AS SHIFT_INDEX__FR, "+
" CASE WHEN SHIFT_INDEX__TO IS NULL THEN 0 ELSE SHIFT_INDEX__TO END AS SHIFT_INDEX__TO "+
......@@ -694,9 +766,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.print("EMP_EMPLOY_EVENTS[sql] :: " + sql);
System.out.print("Parameters 1:: [" + frSqlDate+"]");
patternPStmt = conn.prepareStatement( sql );
patternPStmt.setDate(1,frSqlDate);
//patternPStmt.setDate(1,frSqlDate);
patternPStmt.setString(1,sdf1.format(frSqlDate));//Modified by Sana S on 18/09/2019
patternRs = patternPStmt.executeQuery();
edShiftDate = null;
shiftIndexTo = 0;
......@@ -707,9 +780,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.print("Effective Date :: " + patternRs.getDate( "EFF_DATE" ));
System.out.print("Patten_Code_to :: " + patternRs.getString( "PATTERN_CODE__TO" ));
System.out.print("SHIFT_INDEX__TO :: " + patternRs.getInt( "SHIFT_INDEX__TO" ));
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Adding index of pattern in ArrayList][Start]
edShiftDate = patternRs.getDate( "EFF_DATE" );
lastPatternCodeStr = checkNull(patternRs.getString( "PATTERN_CODE__TO" )).trim();
shiftIndexTo = patternRs.getInt("SHIFT_INDEX__TO");
......@@ -735,14 +808,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
toShiftIndexList.add(lastShiftIndexStr);
effDateList.add(edShiftDate);
}
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Adding index of pattern in ArrayList][End]
}
patternRs.close();
patternRs = null;
patternPStmt.close();
patternPStmt=null;
//
//
if (patternCodeFilt != null && patternCodeFilt.trim().length() > 0)
{
......@@ -751,7 +824,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
" FROM EMP_EMPLOY_EVENTS WHERE EMP_CODE = '"+emp+"' "+
"AND EFF_DATE = ? and nvl(PATTERN_CODE__TO, ' ') = '" + patternCodeFilt + "' AND NVL(CONFIRMED , 'N') = 'N'";
patternPStmt = conn.prepareStatement( sql );
patternPStmt.setDate(1,frSqlDate);
//patternPStmt.setDate(1,frSqlDate);
patternPStmt.setString(1,sdf1.format(frSqlDate));//Modified by Sana S on 18/09/2019
patternRs = patternPStmt.executeQuery();
edShiftDate = null;
shiftIndexTo = 0;
......@@ -762,8 +836,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.print("Pattern Change - Effective Date :: " + patternRs.getDate( "EFF_DATE" ));
System.out.print("Pattern Change - Patten_Code_to :: " + patternRs.getString( "PATTERN_CODE__TO" ));
System.out.print("Pattern Change - SHIFT_INDEX__TO :: " + patternRs.getInt( "SHIFT_INDEX__TO" ));
edShiftDate = patternRs.getDate( "EFF_DATE" );
lastPatternCodeStr = checkNull(patternRs.getString( "PATTERN_CODE__TO" )).trim();
shiftIndexTo = patternRs.getInt("SHIFT_INDEX__TO");
......@@ -789,7 +863,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
toShiftIndexList.add(lastShiftIndexStr);
effDateList.add(edShiftDate);
}
}
patternRs.close();
patternRs = null;
......@@ -797,7 +871,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
patternPStmt=null;
}
//
//
sql = "SELECT PATTERN_CODE__FR,PATTERN_CODE__TO,EFF_DATE, " +
" CASE WHEN SHIFT_INDEX__FR IS NULL THEN 0 ELSE SHIFT_INDEX__FR END AS SHIFT_INDEX__FR, "+
" CASE WHEN SHIFT_INDEX__TO IS NULL THEN 0 ELSE SHIFT_INDEX__TO END AS SHIFT_INDEX__TO "+
......@@ -808,9 +882,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.print("EMP_EMPLOY_EVENTS[sql] :: " + sql);
System.out.print("Parameters 1:: [" + frSqlDate+"]");
patternPStmt = conn.prepareStatement( sql );
patternPStmt.setDate(1,frSqlDate);
// patternPStmt.setDate(1,frSqlDate);
patternPStmt.setString(1,sdf1.format(frSqlDate));//Modified by Sana S on 18/09/2019
patternRs = patternPStmt.executeQuery();
edShiftDate = null;
shiftIndexTo = 0;
......@@ -825,6 +900,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
lastPatternCodeStr = "";
lastShiftIndexStr = "";
edShiftDate = patternRs.getDate( "EFF_DATE" );
System.out.print("edShiftDate:"+edShiftDate+"\n"+"frSqlDate:"+frSqlDate+"\n"+"toSqlDate:"+toSqlDate);
lastPatternCodeStr = checkNull(patternRs.getString( "PATTERN_CODE__TO" )).trim();
shiftIndexTo = patternRs.getInt("SHIFT_INDEX__TO");
lastShiftIndexStr = checkNull(shiftIndexTo+"").trim();
......@@ -833,19 +909,20 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
lastShiftIndexStr = "1";
}
//if(shiftStDate2.compareTo(joiningDate)< 0)
if (edShiftDate.compareTo( frSqlDate) == 0)
//if (edShiftDate.compareTo( frSqlDate) == 0)
if (edShiftDate.equals(sdf1.format(frSqlDate)))
{
isTransfrFound = true; // Modified by Prashant on [23/01/2013] [ to check whether employee is transfered or not]
if (frPatternCodeList.size() > 0)
{
// Added by Prashant on [30/01/2013] [ to check whether Pattern Code List is containing more than one Pattern or not] [Start]
// Added by Prashant on [30/01/2013] [ to check whether Pattern Code List is containing more than one Pattern or not] [Start]
// Modified by Piyush on 18/03/2013 - It should be 1 and not 0
//if (noOfTrf > 0)
if (noOfTrf > 1)
{
continue;
}
// Added by Prashant on [30/01/2013] [ to check whether Pattern Code List is containing more than one Pattern or not] [End]
// Added by Prashant on [30/01/2013] [ to check whether Pattern Code List is containing more than one Pattern or not] [End]
frPatternCodeList.set(0 , lastPatternCodeStr);
toPatternCodeList.set(0 , lastPatternCodeStr);
frShiftIndexList.set(0 , lastShiftIndexStr);
......@@ -863,13 +940,13 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
else if (edShiftDate.compareTo( toSqlDate ) <= 0)
{
// Added by Prashant on [30/01/2013] [ to check whether from End Shift Date is present as Effective Date or not] [Start]
// Added by Prashant on [30/01/2013] [ to check whether from End Shift Date is present as Effective Date or not] [Start]
if(effDateList.contains(edShiftDate))
{
continue;
}
// Added by Prashant on [30/01/2013] [ to check whether from End Shift Date is present as Effective Date or not] [End]
// Added by Prashant on [30/01/2013] [ to check whether from End Shift Date is present as Effective Date or not] [End]
isTransfrFound = true; // Modified by Prashant on [23/01/2013] [ to check whether employee is transfered or not]
frPatternCodeList.add(lastPatternCodeStr);
toPatternCodeList.add(lastPatternCodeStr);
......@@ -884,7 +961,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{
break;
}
*/
*/
else
{
if (isTransfrFound != true )
......@@ -913,14 +990,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
// Modified by Prashant on [23/01/2013] [to set/add employee detail if not transfered ] [End]
}
patternRs.close();
patternRs = null;
patternPStmt.close();
patternPStmt=null;
edShiftDate = frSqlDate;
System.out.print("edShiftDate 1::::: [" + edShiftDate+"]");
System.out.print("effDateList.size() 1::::: [" + effDateList.size()+"]");
......@@ -947,7 +1024,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
stShiftDate = tempEffDate;
lastPatternCodeStr = checkNull(frPatternCodeList.get(ctr).toString());
lastShiftIndexStr = checkNull(frShiftIndexList.get(ctr).toString());
if (lastPatternCodeStr == null || lastPatternCodeStr.trim().length() == 0)
{
......@@ -980,7 +1057,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{
cnt = cnt + 1;
}
}//end of while
if (errString != null && errString.trim().length() > 0)
......@@ -1018,7 +1095,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
else
{
//Commented and added by Varsha V on 20-Jul-18 for calling connection method
//Commented and added by Varsha V on 20-Jul-18 for calling connection method
//errString = itmdbAccessLocal.getErrorString("","VTPCOMPT","","",conn);
errString = itmDBAccess.getErrorString("","VTPCOMPT","","",conn);
}
......@@ -1061,16 +1138,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
conn.close();
conn = null;*/
//Commented by Azhar on [06-Sep-2019][Shifted in above method][End]
if(pstmtn1!=null)
{
pstmtn1.close();
pstmtn1=null;
}
if(pstmtn3!=null)
{
pstmtn3.close();
pstmtn3=null;
}
if(pstmtn1!=null)
{
pstmtn1.close();
pstmtn1=null;
}
if(pstmtn3!=null)
{
pstmtn3.close();
pstmtn3=null;
}
//}
}
catch(Exception e)
......@@ -1097,6 +1174,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//private String insertUpdateWorkShift(EmpInfo empInfo, String empCode, java.sql.Date shiftStDate, java.sql.Date shiftEndDate, String frpatternCode, java.sql.Date patternEffDate, String holiTblNo,int shiftIndexNew, Connection conn, ITMDBAccessLocal itmdbAccessLocal ) throws Exception
private String insertUpdateWorkShift(EmpInfo empInfo, String empCode, java.sql.Date shiftStDate, java.sql.Date shiftEndDate, String frpatternCode, java.sql.Date patternEffDate, String holiTblNo,int shiftIndexNew, Connection conn, ITMDBAccessEJB itmdbAccess ) throws Exception
{
SimpleDateFormat sdf=new SimpleDateFormat("dd-MM-yy");//added by Sana s on 18/09/2019
System.out.println("insertUpdateWorkShift is called...............");
String insertSql ="",updateSql = "",errString = "";
PreparedStatement pstmtn5 = null,pstmtn6=null,pstmtInsert = null,pstmtUpdate = null;
......@@ -1111,7 +1189,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
int t = 0 ;
java.sql.Date stDate = null;
java.util.Date shiftOfDate = null ;
java.util.Date joiningDate = null;
java.util.Date joiningDate = null;
String tempShift = "XXX";
//Added by satya on 07/06/10 [AD90SUN028].start
......@@ -1153,16 +1231,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
insertSql = "INSERT INTO WORK_SHIFT (EMP_CODE,FROM_DT,TO_DT,SHIFT,CHG_USER,CHG_TERM,CHG_DATE,REAL_SHIFT,PATTERN_CODE) "
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][Start]
// +" Values (?,?,?,?,?,?,?,?,?)";
+" Values (?,?,?,?,?,?,FN_SYSDATE(),?,?)";
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][Start]
// +" Values (?,?,?,?,?,?,?,?,?)";
+" Values (?,?,?,?,?,?,FN_SYSDATE(),?,?)";
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][End]
updateSql = "UPDATE WORK_SHIFT SET TO_DT = ? WHERE EMP_CODE = ? AND FROM_DT = ?";
java.sql.Date shiftStDate2 = shiftStDate;
System.out.println("shiftStDate2 : " + shiftStDate2 + " shiftEndDate : " + shiftEndDate);
if (shiftIndexNew == 0)
......@@ -1184,7 +1262,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
insertIntoWorkShiftForHoliday( empCode, shiftStDate, shiftStDate2, holidayType, frpatternCode, conn );
shiftNewStDate = shiftStDate2;
shiftStDate2 = getNextDate( shiftStDate2 );
isShiftGeneratedForHoliday = true;
if (shiftStDate2.compareTo( shiftEndDate ) >= 0 )
{
......@@ -1198,8 +1276,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
shiftStDate = shiftStDate2;
}
}
//uncommented and changed by satya on 07/06/10 [AD90SUN028].end
if( ! (shiftStDate2.compareTo(shiftEndDate) < 0 ))
{
......@@ -1213,15 +1291,15 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
pstmtUpdate = conn.prepareStatement(updateSql);
//ended by nisar on 21/02/06
// ADDED BY DURGA SINGH THAKUR 30/03/2007
cadre = empInfo.cadre;
grade = empInfo.grade;
siteCode = empInfo.workSite;
shiftIndex = shiftIndexNew;//Added by jaimin on 16/06/2008 (AD89SUN014)
/*
shift = getActualshift(shiftStDate2,frpatternCode,shiftPattern,stDate,noOfDays);
*/
*/
shift = getActualshift(shiftStDate2,frpatternCode,shiftIndexNew,shiftPattern,stDate,noOfDays,conn);
System.out.println("shift [" + shift + "] tempShift [" + tempShift + "] shiftStDate [" + shiftStDate + "] shiftStDate2 [" + shiftStDate2 + "]");
......@@ -1235,8 +1313,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
sql = "SELECT COUNT(*) FROM WORK_SHIFT WHERE FROM_DT = ? AND SHIFT = '"+tempShift+"' AND EMP_CODE = '"+empCode+"'";
pstmtn6 = conn.prepareStatement(sql);
pstmtn6.setDate(1, shiftStDate);
//pstmtn6.setDate(1, shiftStDate);
pstmtn6.setString(1, sdf.format(shiftStDate));//Moldified by Sana S on 18/09/2019
System.out.println("Sql At 1444 :: " + sql);
System.out.println("PARAMETER IN UPDATE QUERY SHIFT START DATE(FROM_DT) =["+shiftStDate+"]");
System.out.println("PARAMETER IN UPDATE QUERY SHIFT =["+tempShift+"]");
......@@ -1260,8 +1338,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("In insert at 668 insertSql "+insertSql);
shiftStDate = shiftStDate2;
pstmtInsert.setString(1,empCode);
pstmtInsert.setDate(2,shiftStDate);
pstmtInsert.setDate(3,shiftStDate2);
pstmtInsert.setString(2,sdf.format(shiftStDate));//Modified By Sana S on 18/09/2019
pstmtInsert.setString(3,sdf.format(shiftStDate2));//Modified By Sana S on 18/09/2019
pstmtInsert.setString(4,shift);
pstmtInsert.setString(5,chgUser);
pstmtInsert.setString(6,chgTerm);
......@@ -1276,14 +1354,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
else if( cnt > 0 )
{
System.out.println( "shiftStDate2.compare(shiftStDate) :: ("
+ shiftStDate2.toString() + ").compare(" + shiftStDate.toString() + ")="
+ shiftStDate2.compareTo( shiftStDate ) );
+ shiftStDate2.toString() + ").compare(" + shiftStDate.toString() + ")="
+ shiftStDate2.compareTo( shiftStDate ) );
System.out.println("In update at 686 updateSql "+updateSql);
pstmtUpdate.setDate(1,shiftStDate2);
pstmtUpdate.setString(1,sdf.format(shiftStDate2));//Modified by Sana S on 18/09/2019
pstmtUpdate.setString(2,empCode);
pstmtUpdate.setDate(3,shiftStDate);
pstmtUpdate.setString(3,sdf.format(shiftStDate));//Modified by Sana S on 18/09/2019
pstmtUpdate.executeUpdate();
pstmtUpdate.clearParameters();
pstmtUpdate.close();
......@@ -1299,7 +1377,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
pstmtUpdate.close();
pstmtUpdate=null;
}
{
System.out.println("Before Incrementing shiftStDate2 by one day.........::"+shiftStDate2);
shiftStDate2 = getNextDate( shiftStDate2 ); //Gulzar - 17/09/09
......@@ -1315,7 +1393,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
conn.rollback();
return errString;
}
*/
*/
}catch(Exception e){
System.out.println("Exception "+e);
e.printStackTrace();
......@@ -1367,7 +1445,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
return "";
}//end of insertUpdateWorkShift
//End - Overload - function added by jaimin on 16/06/2008 (AD89SUN014)
//End - Overload - function added by jaimin on 16/06/2008 (AD89SUN014)
private String getActualshift(java.sql.Date currDate,String patternCode,int shiftIndex,String shiftPattern,java.sql.Date shiftStDate,int noOfDays, Connection conn)
......@@ -1447,7 +1525,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
PreparedStatement stmt = null;
ResultSet rs = null;
int cnt = 0;
System.out.println("Shift date isHoliday :: " + shiftDate);
System.out.println("Hol Type in isHoliday :: " + holidayType);
try{
......@@ -1473,10 +1551,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
try
{
if(rs!=null)
{
rs.close();
rs = null;
}
{
rs.close();
rs = null;
}
if(stmt != null)
{
stmt.close();
......@@ -1487,7 +1565,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
return cnt >= 1;
}
private void insertIntoWorkShiftForHoliday(String empCode,java.sql.Date shiftStDate,
java.sql.Date shiftStDate2,String shift,String frpatternCode,Connection conn)
java.sql.Date shiftStDate2,String shift,String frpatternCode,Connection conn)
{//ADDED BY NISAR ON 17/12/07 FOR REQUERST ID : AD7SUN0016
PreparedStatement pstmtInsert = null, pstmtn6=null, pstmtUpdate=null;
ResultSet rsin2 = null;
......@@ -1495,24 +1573,26 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
String insertSql = null;
String updateSql = null;
int cnt = 0;
SimpleDateFormat sdf = null;
try
{
sdf = new SimpleDateFormat( genericUtility.getApplDateFormat() );
//sdf = new SimpleDateFormat("dd-MM-yy");//Modified By Sana S on 18/09/2019
insertSql = "INSERT INTO WORK_SHIFT (EMP_CODE,FROM_DT,TO_DT,SHIFT,CHG_USER,CHG_TERM,CHG_DATE,REAL_SHIFT,PATTERN_CODE) "
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][Start]
//+" Values (?,?,?,?,?,?,?,?,?)";
+" Values (?,?,?,?,?,?,FN_SYSDATE(),?,?)";
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][Start]
//+" Values (?,?,?,?,?,?,?,?,?)";
+" Values (?,?,?,?,?,?,FN_SYSDATE(),?,?)";
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][End]
updateSql = "UPDATE WORK_SHIFT SET TO_DT = ? WHERE EMP_CODE = ? AND FROM_DT = ?";
sql = "SELECT COUNT(*) FROM WORK_SHIFT WHERE FROM_DT = ? AND SHIFT = '" + shift + "' AND EMP_CODE = '"+empCode+"'";
pstmtn6 = conn.prepareStatement(sql);
//next line added by msalam on 28/02/07 and modified line added.
pstmtn6.setDate( 1, shiftStDate );
//pstmtn6.setDate( 1, shiftStDate );
pstmtn6.setString( 1, sdf.format(shiftStDate));//Modified by sana s on 18/09/2019
//end next line added by msalam on 28/02/07 and modified line added.
//pstmtn6.setDate(2, shiftStDate2);//ADDED EXTRA PARAMETER LINE BY DURGA 02/04/07
System.out.println("Sql At 1365 :: " + sql);
......@@ -1530,7 +1610,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
pstmtn6.clearParameters();
pstmtn6.close();
pstmtn6=null;
System.out.println( "shiftStDate2.compare(shiftStDate) :: ("
+ shiftStDate2.toString() + ").compare(" + shiftStDate.toString() + ")="
+ shiftStDate2.compareTo( shiftStDate ) );
......@@ -1543,13 +1623,17 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("In insert at 668 insertSql "+insertSql);
shiftStDate = shiftStDate2;
pstmtInsert.setString( 1, empCode );
pstmtInsert.setDate( 2, shiftStDate );
pstmtInsert.setDate( 3, shiftStDate2 );
//Modified by sana s on 18/09/2019
/*pstmtInsert.setString( 2, shiftStDate );
pstmtInsert.setString( 3, shiftStDate2 );*/
pstmtInsert.setString( 2, sdf.format(shiftStDate));
pstmtInsert.setString( 3, sdf.format(shiftStDate2));
//Modified by sana s on 18/09/2019
pstmtInsert.setString( 4, shift );
pstmtInsert.setString( 5, chgUser );
pstmtInsert.setString( 6, chgTerm );
//next line changed by msalam and modified line added on 280207
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][Start]
//pstmtInsert.setTimestamp( 7, new java.sql.Timestamp( System.currentTimeMillis() ) );
//Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][End]
......@@ -1571,14 +1655,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
else if( cnt > 0 )
{
System.out.println( "In insertIntoWorkShiftForHoliday shiftStDate2.compare(shiftStDate) :: ("
+ shiftStDate2.toString() + ").compare(" + shiftStDate.toString() + ")="
+ shiftStDate2.compareTo( shiftStDate ) );
+ shiftStDate2.toString() + ").compare(" + shiftStDate.toString() + ")="
+ shiftStDate2.compareTo( shiftStDate ) );
System.out.println( "In update at 686 updateSql " + updateSql );
pstmtUpdate = conn.prepareStatement(updateSql);
pstmtUpdate.setDate(1,shiftStDate2);
//pstmtUpdate.setDate(1,shiftStDate2);
pstmtUpdate.setString(1,sdf.format(shiftStDate2));// Modified By Sana S on 18/09/2019
pstmtUpdate.setString(2,empCode);
pstmtUpdate.setDate(3,shiftStDate);
//pstmtUpdate.setDate(3,shiftStDate);
pstmtUpdate.setString(3,sdf.format(shiftStDate));// Modified By Sana S on 18/09/2019
pstmtUpdate.executeUpdate();
//pstmtUpdate.clearParameters();
pstmtUpdate.close();
......@@ -1603,18 +1689,20 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//ADDED BY MSALAM ON 250208 TO GET HOLIDAY DAY TYPE
private String getHolidayTypeForDate( java.util.Date shiftDate, String holiTblNo, Connection conn)
{
SimpleDateFormat sdf=new SimpleDateFormat("dd-MM-yy");
Timestamp ts = new Timestamp(shiftDate.getTime()) ;
String sqlStr = null;
PreparedStatement stmt = null;
ResultSet rs = null;
String holType = null;
System.out.println("Holiday type for date :: " + shiftDate);
try{
//sqlStr = "select Hol_Type from holiday where Hol_Date = ? and HOL_TBLNO ='" + holiTblNo + "'";//Commentd by jaimin on 17/06/2008 (AD89SUN016)
sqlStr = "select Hol_Type from holiday where Hol_Date = ? and HOL_TBLNO ='" + holiTblNo + "' and HOL_TYPE <> 'W' "; //Added by jaimin on 17/06/2008 (AD89SUN016)
stmt = conn.prepareStatement( sqlStr );
stmt.setTimestamp(1, ts);
// stmt.setTimestamp(1, ts);
stmt.setString(1, sdf.format(ts));//Modified by Sana S on 18/09/2019
System.out.println("Holiday Type Setting Timestamp:["+ts+"]");
System.out.println("Sql Str for Holiday Holiday Type :: " + sqlStr);
rs = stmt.executeQuery();
......@@ -1622,7 +1710,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{
holType = rs.getString( "Hol_Type" );
}
System.out.println( "Hol Type Holiday :: " + holType );
rs.close();
rs = null;
......@@ -1636,10 +1724,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
try
{
if(rs!=null)
{
rs.close();
rs = null;
}
{
rs.close();
rs = null;
}
if(stmt != null)
{
stmt.close();
......@@ -1651,7 +1739,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
}
//END MSALAM ON 250208
//Bean class added by msalam on 170308
private class EmpInfo{
public class EmpInfo{
public String empCode = null;
public String empFname = null;
public String empLname = null;
......@@ -1719,6 +1807,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
public int daysDiff( java.util.Date dateFrom, java.util.Date dateTo , Connection conn)
{
SimpleDateFormat sdf=new SimpleDateFormat("dd-MM-yy");//added by Sana s on 18/09/2019
String dbDateFormat = "";
SimpleDateFormat simpledateformat = null;
String fromDate = "";
......@@ -1730,7 +1819,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
try
{
dbDateFormat = genericUtility.getDBDateFormat();
simpledateformat = new SimpleDateFormat(dbDateFormat);
//simpledateformat = new SimpleDateFormat(dbDateFormat);
simpledateformat = new SimpleDateFormat("dd-MM-yy");//Modified by Sana S on 18/09/2019
fromDate = simpledateformat.format(dateFrom);
toDate = simpledateformat.format(dateTo);
String sql = "SELECT TO_DATE(?,?) - TO_DATE(?,?) FROM DUAL";
......@@ -1743,7 +1833,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("todate = [ "+toDate+" ], dbDateFormat = [ "+dbDateFormat+" ], fromDate = [ "+fromDate+" ]");
System.out.println("daysDiffsql===>"+sql);
rSet = pStmt.executeQuery();
pStmt.clearParameters();
pStmt.clearParameters();
while(rSet.next())
{
......@@ -1814,7 +1904,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
return noOfDays;
}
//End added gulzar - 06/07/10[]
*/
*/
private String checkNull(String input)
{
if (input==null)
......
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