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
Show 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 Window Name : w_sordalloc
*/ */
package ibase.webitm.ejb.adm; package ibase.webitm.ejb.adm;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.util.*; import java.util.*;
import java.sql.*; import java.sql.*;
import java.sql.Date;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import org.w3c.dom.*; import org.w3c.dom.*;
import javax.ejb.*; import javax.ejb.*;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.*;
import ibase.webitm.ejb.adm.ShiftProcess.EmpInfo;
//import ibase.webitm.utility.GenericUtility; //import ibase.webitm.utility.GenericUtility;
import ibase.utility.CommonConstants; import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
...@@ -47,6 +49,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -47,6 +49,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
//Modified by Azhar on [06-Sep-2019][As per new framework][End] //Modified by Azhar on [06-Sep-2019][As per new framework][End]
ITMDBAccessEJB itmDBAccessEJB=new ITMDBAccessEJB();
CommonConstants commonConstants = new CommonConstants(); CommonConstants commonConstants = new CommonConstants();
String chgUser = null; String chgUser = null;
...@@ -126,7 +130,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -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] //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);
rtrStr = process(headerDom, detailDom, windowName, xtraParams,conn); rtrStr = process(headerDom, detailDom, windowName, xtraParams,conn);
System.out.println("rtrStr :"+rtrStr);
if(rtrStr == null || rtrStr.trim().length() == 0) if(rtrStr == null || rtrStr.trim().length() == 0)
{ {
conn.commit(); conn.commit();
...@@ -136,6 +140,19 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -136,6 +140,19 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
conn.rollback(); conn.rollback();
return rtrStr; 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] //Modified by Azhar on[06-Sep-2019][To invoke process method from Events Affecting Confirmation][End]
} }
catch (Exception e) catch (Exception e)
...@@ -242,7 +259,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -242,7 +259,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
String holiTblNo =null; String holiTblNo =null;
int selectedLineNo = 0; 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(); HashMap empEventsMap = new HashMap();
int shiftIndexFr = 0;//Added by jaimin on 16/06/2008 (AD89SUN014) int shiftIndexFr = 0;//Added by jaimin on 16/06/2008 (AD89SUN014)
int shiftIndexTo = 0;//Added by Jaimin on 16/06/2008 (AD89SUN014) int shiftIndexTo = 0;//Added by Jaimin on 16/06/2008 (AD89SUN014)
...@@ -264,7 +284,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -264,7 +284,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//Commented by Azhar on[06-Sep-2019][Connection created in above method][Start] //Commented by Azhar on[06-Sep-2019][Connection created in above method][Start]
//connDriver = new ConnDriver(); //connDriver = new ConnDriver();
//Commented by Azhar on[06-Sep-2019][Connection created in above method][End] //Commented by Azhar on[06-Sep-2019][Connection created in above method][End]
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat()); //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] //Commented by Azhar on[06-Sep-2019][Shifted in above method][Start]
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//Commented by Azhar on[06-Sep-2019][Shifted in above method][End] //Commented by Azhar on[06-Sep-2019][Shifted in above method][End]
...@@ -276,7 +297,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -276,7 +297,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); 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 //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,"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; Node hdrNode = null;
...@@ -295,7 +317,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -295,7 +317,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
} }
if( chgTerm == null || chgTerm.trim().length() == 0 ) 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()); toDay = new java.sql.Date(System.currentTimeMillis());
...@@ -354,7 +378,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -354,7 +378,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
if( xtraParams.indexOf("user_lang=") <= 0 ) if( xtraParams.indexOf("user_lang=") <= 0 )
{ {
//fromDate = genericUtility.getValidDateString(fromDate, "yy-MM-dd" , genericUtility.getApplDateFormat()); //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 //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 ...@@ -375,7 +400,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
if( xtraParams.indexOf("user_lang=") <= 0 ) if( xtraParams.indexOf("user_lang=") <= 0 )
{ {
//toDate = genericUtility.getValidDateString(fromDate, "yy-MM-dd" , genericUtility.getApplDateFormat()); //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 //Added By Rupesh on [14-10-11] [CCF No.:-AD01SUN0018] [Reason :- Convert Date format from ITM format to ApplDateFormat] End
...@@ -387,6 +412,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -387,6 +412,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//getting date in sql date and dbdate format //getting date in sql date and dbdate format
String strFrDate = genericUtility.getValidDateString(fromDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat()); String strFrDate = genericUtility.getValidDateString(fromDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat());
SimpleDateFormat sdf = new SimpleDateFormat(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+"]"); System.out.println("FromDate in DbDate Format :["+strFrDate+"]");
String strToDate = genericUtility.getValidDateString(toDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat()); String strToDate = genericUtility.getValidDateString(toDate,genericUtility.getApplDateFormat(),genericUtility.getApplDateFormat());
System.out.println("To Date in Db Date Format:["+strToDate+"]"); System.out.println("To Date in Db Date Format:["+strToDate+"]");
...@@ -397,16 +423,19 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -397,16 +423,19 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
java.sql.Date frSqlDate = new java.sql.Date(frDate.getTime()); java.sql.Date frSqlDate = new java.sql.Date(frDate.getTime());
System.out.println("java.sql.Date From :["+frSqlDate+"]"); System.out.println("java.sql.Date From :["+frSqlDate+"]");
SimpleDateFormat sdt = new SimpleDateFormat(genericUtility.getApplDateFormat()); 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); java.util.Date tDate = sdt.parse(strToDate);
toPrdDate = tDate; toPrdDate = tDate;
System.out.println("To date Object :"+tDate); System.out.println("To date Object :"+tDate);
java.sql.Date toSqlDate = new java.sql.Date(tDate.getTime()); 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 //end getting dates in sqldate and dbdate format
if (siteCodeFr != null ) if (siteCodeFr != null )
{ {
//query changed by msalam on 170308 as it was unnecessary to call the query repeteadly //query changed by msalam on 170308 as it was unnecessary to call the query repeteadly
getDataSql = " SELECT e.EMP_CODE, e.EMP_FNAME, e.EMP_LNAME, e.WORK_SHIFT, e.SHIFT_ROT, e.HOL_TBLNO, " //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 ," +" 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] //Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002] [Fetching relieve date of employee][Start]
+"e.RELIEVE_DATE " +"e.RELIEVE_DATE "
...@@ -414,7 +443,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -414,7 +443,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
+" FROM EMPLOYEE e, " +" FROM EMPLOYEE e, "
+" ( SELECT t.emp_code, t.FROM_DT FROM WORK_SHIFT t " +" ( SELECT t.emp_code, t.FROM_DT FROM WORK_SHIFT t "
+" WHERE t.EMP_CODE >= '" + empCodeFr + "'" +" WHERE t.EMP_CODE >= '" + empCodeFr + "'"
+" AND t.EMP_CODE <= '" + empCodeTo + "'" +" AND t.EMP_CODE <= '" + empCodeFr + "'"
+" and ? BETWEEN FROM_DT AND TO_DT ) ws " +" and ? BETWEEN FROM_DT AND TO_DT ) ws "
+" WHERE e.emp_code = ws.emp_code( + ) " +" WHERE e.emp_code = ws.emp_code( + ) "
+" and e.EMP_CODE >= '" + empCodeFr + "'" +" and e.EMP_CODE >= '" + empCodeFr + "'"
...@@ -426,23 +455,41 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -426,23 +455,41 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
+" AND SHIFT_ROT = 'Y' " +" 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 // 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 nvl( status, ' ') <> 'S' AND e.date_Join <= ?"; +" 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 ,"
+"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; PreparedStatement pStmt = null;
System.out.println("\n\n getDataSql :"+getDataSql); System.out.println("\n\n getDataSql :"+getDataSql);
pStmt = conn.prepareStatement( getDataSql ); pStmt = conn.prepareStatement( getDataSql );
System.out.print("Parameters 1:: [" + frSqlDate+"]"); 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 // 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+"]"); System.out.print("Parameters 1-1:: [" + toSqlDate+"]");
pStmt.setDate( 2, toSqlDate );
//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 // 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( ); rsn1 = pStmt.executeQuery( );
while( rsn1.next() ) while( rsn1.next() )
{ {
System.out.print("empList:");
EmpInfo empInfo = new EmpInfo(); EmpInfo empInfo = new EmpInfo();
empInfo.empCode = rsn1.getString( "EMP_CODE" ); empInfo.empCode = rsn1.getString( "EMP_CODE" );
empInfo.workShift = checkNull(rsn1.getString( "WORK_SHIFT" )).trim(); empInfo.workShift = checkNull(rsn1.getString( "WORK_SHIFT" )).trim();
...@@ -458,6 +505,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -458,6 +505,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
empInfo.relieveDate = rsn1.getDate( "RELIEVE_DATE" ); 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] //Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][Fetching relieve date of employee ][End]
empList.add( empInfo ); empList.add( empInfo );
System.out.print("empList:"+empList);
} }
rsn1.close(); rsn1.close();
...@@ -513,6 +561,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -513,6 +561,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
int updCnt = 0; int updCnt = 0;
java.sql.Date reliDate = null; java.sql.Date reliDate = null;
reliDate = empInfo.relieveDate; reliDate = empInfo.relieveDate;
System.out.print("reliDate:"+reliDate);
if(reliDate != null && reliDate.compareTo(toSqlDate) < 0) if(reliDate != null && reliDate.compareTo(toSqlDate) < 0)
{ {
toSqlDate = (java.sql.Date)reliDate; toSqlDate = (java.sql.Date)reliDate;
...@@ -522,8 +571,12 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -522,8 +571,12 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
updateSql = "UPDATE WORK_SHIFT SET TO_DT = ? WHERE EMP_CODE = '"+emp+"' "+ 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 = conn.prepareStatement(updateSql);
pstmtTemp.setDate( 1, toSqlDate ); //Modified By Sana S on 18/09/2019 [start]
pstmtTemp.setDate( 2, toSqlDate ); /*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(); updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters(); pstmtTemp.clearParameters();
if ( updCnt > 0 ) if ( updCnt > 0 )
...@@ -535,7 +588,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -535,7 +588,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
updateSql = "DELETE FROM WORK_SHIFT WHERE EMP_CODE = '"+emp+"' "+ updateSql = "DELETE FROM WORK_SHIFT WHERE EMP_CODE = '"+emp+"' "+
"AND FROM_DT > ? "; "AND FROM_DT > ? ";
pstmtTemp = conn.prepareStatement(updateSql); 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(); updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters(); pstmtTemp.clearParameters();
if ( updCnt > 0 ) if ( updCnt > 0 )
...@@ -557,6 +612,10 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -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] //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; 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) if (frSqlDate.compareTo(empJoinDt) < 0)
{ {
frSqlDate = (java.sql.Date)empJoinDt; frSqlDate = (java.sql.Date)empJoinDt;
...@@ -576,9 +635,12 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -576,9 +635,12 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
updateSql = "UPDATE WORK_SHIFT SET TO_DT = ? WHERE EMP_CODE = '"+emp+"' "+ 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 = conn.prepareStatement(updateSql);
pstmtTemp.setDate( 1, prevFrDate ); //pstmtTemp.setDate( 1, prevFrDate );
pstmtTemp.setDate( 2, frSqlDate ); pstmtTemp.setString( 1, sdf1.format(prevFrDate) );// Modified By Sana S on 18/09/2019
pstmtTemp.setDate( 3, frSqlDate ); //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(); updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters(); pstmtTemp.clearParameters();
if ( updCnt > 0 ) if ( updCnt > 0 )
...@@ -593,9 +655,15 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -593,9 +655,15 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
updateSql = "UPDATE WORK_SHIFT SET FROM_DT = ? WHERE EMP_CODE = '"+emp+"' "+ 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 = 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( 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(); updCnt = pstmtTemp.executeUpdate();
pstmtTemp.clearParameters(); pstmtTemp.clearParameters();
if ( updCnt > 0 ) if ( updCnt > 0 )
...@@ -614,12 +682,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -614,12 +682,16 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("sql :"+sql); System.out.println("sql :"+sql);
pstmtn2 = conn.prepareStatement(sql); pstmtn2 = conn.prepareStatement(sql);
pstmtn2.setString(1,emp); 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); 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); System.out.println("toSqlDate :-"+toSqlDate);
pstmtn2.setDate(4,frSqlDate); //pstmtn2.setDate(4,frSqlDate);
pstmtn2.setDate(5,toSqlDate); 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(); upd = pstmtn2.executeUpdate();
System.out.println("No Of record deleted from WORK_SHIFT ["+upd+"]"); System.out.println("No Of record deleted from WORK_SHIFT ["+upd+"]");
pstmtn2.close(); pstmtn2.close();
...@@ -635,14 +707,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -635,14 +707,14 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
patternCode = patternCodeFilt; patternCode = patternCodeFilt;
} }
ArrayList frPatternCodeList = new ArrayList(); ArrayList<String> frPatternCodeList = new ArrayList<String>();
ArrayList toPatternCodeList = new ArrayList(); 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] //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<String> frShiftIndexList = new ArrayList<String>();
ArrayList toShiftIndexList = new ArrayList(); 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] //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()); java.sql.Date effDate = new java.sql.Date(System.currentTimeMillis());
PreparedStatement patternPStmt = null; PreparedStatement patternPStmt = null;
...@@ -696,7 +768,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -696,7 +768,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.print("Parameters 1:: [" + frSqlDate+"]"); System.out.print("Parameters 1:: [" + frSqlDate+"]");
patternPStmt = conn.prepareStatement( sql ); 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(); patternRs = patternPStmt.executeQuery();
edShiftDate = null; edShiftDate = null;
shiftIndexTo = 0; shiftIndexTo = 0;
...@@ -742,7 +815,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -742,7 +815,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
patternRs = null; patternRs = null;
patternPStmt.close(); patternPStmt.close();
patternPStmt=null; patternPStmt=null;
// //
if (patternCodeFilt != null && patternCodeFilt.trim().length() > 0) if (patternCodeFilt != null && patternCodeFilt.trim().length() > 0)
{ {
...@@ -751,7 +824,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -751,7 +824,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
" FROM EMP_EMPLOY_EVENTS WHERE EMP_CODE = '"+emp+"' "+ " FROM EMP_EMPLOY_EVENTS WHERE EMP_CODE = '"+emp+"' "+
"AND EFF_DATE = ? and nvl(PATTERN_CODE__TO, ' ') = '" + patternCodeFilt + "' AND NVL(CONFIRMED , 'N') = 'N'"; "AND EFF_DATE = ? and nvl(PATTERN_CODE__TO, ' ') = '" + patternCodeFilt + "' AND NVL(CONFIRMED , 'N') = 'N'";
patternPStmt = conn.prepareStatement( sql ); 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(); patternRs = patternPStmt.executeQuery();
edShiftDate = null; edShiftDate = null;
shiftIndexTo = 0; shiftIndexTo = 0;
...@@ -797,7 +871,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -797,7 +871,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
patternPStmt=null; patternPStmt=null;
} }
// //
sql = "SELECT PATTERN_CODE__FR,PATTERN_CODE__TO,EFF_DATE, " + 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__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 "+ " CASE WHEN SHIFT_INDEX__TO IS NULL THEN 0 ELSE SHIFT_INDEX__TO END AS SHIFT_INDEX__TO "+
...@@ -810,7 +884,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -810,7 +884,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.print("Parameters 1:: [" + frSqlDate+"]"); System.out.print("Parameters 1:: [" + frSqlDate+"]");
patternPStmt = conn.prepareStatement( sql ); 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(); patternRs = patternPStmt.executeQuery();
edShiftDate = null; edShiftDate = null;
shiftIndexTo = 0; shiftIndexTo = 0;
...@@ -825,6 +900,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -825,6 +900,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
lastPatternCodeStr = ""; lastPatternCodeStr = "";
lastShiftIndexStr = ""; lastShiftIndexStr = "";
edShiftDate = patternRs.getDate( "EFF_DATE" ); edShiftDate = patternRs.getDate( "EFF_DATE" );
System.out.print("edShiftDate:"+edShiftDate+"\n"+"frSqlDate:"+frSqlDate+"\n"+"toSqlDate:"+toSqlDate);
lastPatternCodeStr = checkNull(patternRs.getString( "PATTERN_CODE__TO" )).trim(); lastPatternCodeStr = checkNull(patternRs.getString( "PATTERN_CODE__TO" )).trim();
shiftIndexTo = patternRs.getInt("SHIFT_INDEX__TO"); shiftIndexTo = patternRs.getInt("SHIFT_INDEX__TO");
lastShiftIndexStr = checkNull(shiftIndexTo+"").trim(); lastShiftIndexStr = checkNull(shiftIndexTo+"").trim();
...@@ -833,7 +909,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -833,7 +909,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
lastShiftIndexStr = "1"; lastShiftIndexStr = "1";
} }
//if(shiftStDate2.compareTo(joiningDate)< 0) //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] isTransfrFound = true; // Modified by Prashant on [23/01/2013] [ to check whether employee is transfered or not]
if (frPatternCodeList.size() > 0) if (frPatternCodeList.size() > 0)
...@@ -1097,6 +1174,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -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, 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 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..............."); System.out.println("insertUpdateWorkShift is called...............");
String insertSql ="",updateSql = "",errString = ""; String insertSql ="",updateSql = "",errString = "";
PreparedStatement pstmtn5 = null,pstmtn6=null,pstmtInsert = null,pstmtUpdate = null; PreparedStatement pstmtn5 = null,pstmtn6=null,pstmtInsert = null,pstmtUpdate = null;
...@@ -1235,8 +1313,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -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+"'"; sql = "SELECT COUNT(*) FROM WORK_SHIFT WHERE FROM_DT = ? AND SHIFT = '"+tempShift+"' AND EMP_CODE = '"+empCode+"'";
pstmtn6 = conn.prepareStatement(sql); 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("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 START DATE(FROM_DT) =["+shiftStDate+"]");
System.out.println("PARAMETER IN UPDATE QUERY SHIFT =["+tempShift+"]"); System.out.println("PARAMETER IN UPDATE QUERY SHIFT =["+tempShift+"]");
...@@ -1260,8 +1338,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1260,8 +1338,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("In insert at 668 insertSql "+insertSql); System.out.println("In insert at 668 insertSql "+insertSql);
shiftStDate = shiftStDate2; shiftStDate = shiftStDate2;
pstmtInsert.setString(1,empCode); pstmtInsert.setString(1,empCode);
pstmtInsert.setDate(2,shiftStDate); pstmtInsert.setString(2,sdf.format(shiftStDate));//Modified By Sana S on 18/09/2019
pstmtInsert.setDate(3,shiftStDate2); pstmtInsert.setString(3,sdf.format(shiftStDate2));//Modified By Sana S on 18/09/2019
pstmtInsert.setString(4,shift); pstmtInsert.setString(4,shift);
pstmtInsert.setString(5,chgUser); pstmtInsert.setString(5,chgUser);
pstmtInsert.setString(6,chgTerm); pstmtInsert.setString(6,chgTerm);
...@@ -1281,9 +1359,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1281,9 +1359,9 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("In update at 686 updateSql "+updateSql); 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.setString(2,empCode);
pstmtUpdate.setDate(3,shiftStDate); pstmtUpdate.setString(3,sdf.format(shiftStDate));//Modified by Sana S on 18/09/2019
pstmtUpdate.executeUpdate(); pstmtUpdate.executeUpdate();
pstmtUpdate.clearParameters(); pstmtUpdate.clearParameters();
pstmtUpdate.close(); pstmtUpdate.close();
...@@ -1367,7 +1445,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1367,7 +1445,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
} }
return ""; return "";
}//end of insertUpdateWorkShift }//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) private String getActualshift(java.sql.Date currDate,String patternCode,int shiftIndex,String shiftPattern,java.sql.Date shiftStDate,int noOfDays, Connection conn)
...@@ -1502,6 +1580,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1502,6 +1580,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
{ {
sdf = new SimpleDateFormat( genericUtility.getApplDateFormat() ); 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) " 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] //Modified by Rupesh on [26/10/2012][CCF No.:COR10/C252 -AD01SUN037 & COR11/C025-AD1ASUN002][To insert CHG_DATE with time][Start]
//+" Values (?,?,?,?,?,?,?,?,?)"; //+" Values (?,?,?,?,?,?,?,?,?)";
...@@ -1512,7 +1591,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1512,7 +1591,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
sql = "SELECT COUNT(*) FROM WORK_SHIFT WHERE FROM_DT = ? AND SHIFT = '" + shift + "' AND EMP_CODE = '"+empCode+"'"; sql = "SELECT COUNT(*) FROM WORK_SHIFT WHERE FROM_DT = ? AND SHIFT = '" + shift + "' AND EMP_CODE = '"+empCode+"'";
pstmtn6 = conn.prepareStatement(sql); pstmtn6 = conn.prepareStatement(sql);
//next line added by msalam on 28/02/07 and modified line added. //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. //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 //pstmtn6.setDate(2, shiftStDate2);//ADDED EXTRA PARAMETER LINE BY DURGA 02/04/07
System.out.println("Sql At 1365 :: " + sql); System.out.println("Sql At 1365 :: " + sql);
...@@ -1543,8 +1623,12 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1543,8 +1623,12 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println("In insert at 668 insertSql "+insertSql); System.out.println("In insert at 668 insertSql "+insertSql);
shiftStDate = shiftStDate2; shiftStDate = shiftStDate2;
pstmtInsert.setString( 1, empCode ); pstmtInsert.setString( 1, empCode );
pstmtInsert.setDate( 2, shiftStDate ); //Modified by sana s on 18/09/2019
pstmtInsert.setDate( 3, shiftStDate2 ); /*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( 4, shift );
pstmtInsert.setString( 5, chgUser ); pstmtInsert.setString( 5, chgUser );
pstmtInsert.setString( 6, chgTerm ); pstmtInsert.setString( 6, chgTerm );
...@@ -1576,9 +1660,11 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1576,9 +1660,11 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
System.out.println( "In update at 686 updateSql " + updateSql ); System.out.println( "In update at 686 updateSql " + updateSql );
pstmtUpdate = conn.prepareStatement(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.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.executeUpdate();
//pstmtUpdate.clearParameters(); //pstmtUpdate.clearParameters();
pstmtUpdate.close(); pstmtUpdate.close();
...@@ -1603,6 +1689,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1603,6 +1689,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//ADDED BY MSALAM ON 250208 TO GET HOLIDAY DAY TYPE //ADDED BY MSALAM ON 250208 TO GET HOLIDAY DAY TYPE
private String getHolidayTypeForDate( java.util.Date shiftDate, String holiTblNo, Connection conn) private String getHolidayTypeForDate( java.util.Date shiftDate, String holiTblNo, Connection conn)
{ {
SimpleDateFormat sdf=new SimpleDateFormat("dd-MM-yy");
Timestamp ts = new Timestamp(shiftDate.getTime()) ; Timestamp ts = new Timestamp(shiftDate.getTime()) ;
String sqlStr = null; String sqlStr = null;
PreparedStatement stmt = null; PreparedStatement stmt = null;
...@@ -1614,7 +1701,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1614,7 +1701,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
//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 + "'";//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) 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 = 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("Holiday Type Setting Timestamp:["+ts+"]");
System.out.println("Sql Str for Holiday Holiday Type :: " + sqlStr); System.out.println("Sql Str for Holiday Holiday Type :: " + sqlStr);
rs = stmt.executeQuery(); rs = stmt.executeQuery();
...@@ -1651,7 +1739,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1651,7 +1739,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
} }
//END MSALAM ON 250208 //END MSALAM ON 250208
//Bean class added by msalam on 170308 //Bean class added by msalam on 170308
private class EmpInfo{ public class EmpInfo{
public String empCode = null; public String empCode = null;
public String empFname = null; public String empFname = null;
public String empLname = null; public String empLname = null;
...@@ -1719,6 +1807,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -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) 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 = ""; String dbDateFormat = "";
SimpleDateFormat simpledateformat = null; SimpleDateFormat simpledateformat = null;
String fromDate = ""; String fromDate = "";
...@@ -1730,7 +1819,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1730,7 +1819,8 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
try try
{ {
dbDateFormat = genericUtility.getDBDateFormat(); 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); fromDate = simpledateformat.format(dateFrom);
toDate = simpledateformat.format(dateTo); toDate = simpledateformat.format(dateTo);
String sql = "SELECT TO_DATE(?,?) - TO_DATE(?,?) FROM DUAL"; String sql = "SELECT TO_DATE(?,?) - TO_DATE(?,?) FROM DUAL";
...@@ -1814,7 +1904,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP ...@@ -1814,7 +1904,7 @@ public class ShiftProcess extends ProcessEJB implements ShiftProcessLocal,ShiftP
return noOfDays; return noOfDays;
} }
//End added gulzar - 06/07/10[] //End added gulzar - 06/07/10[]
*/ */
private String checkNull(String input) private String checkNull(String input)
{ {
if (input==null) 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