Commit b8fd03ed authored by dpingle's avatar dpingle

* Dipesh- Added Comp_type in system events, set bussinessObj in...

* Dipesh- Added Comp_type in system events, set bussinessObj in confirmAttendanceProcess method using procWindow
on [28/08/2019]

AttdDailyPos.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@206293 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 561320f8
...@@ -73,6 +73,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -73,6 +73,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
//Modified by Rohini Telang on 12/feb/2019[Req ID: A17DSUN001][START] //Modified by Rohini Telang on 12/feb/2019[Req ID: A17DSUN001][START]
String xmlStringDt = ""; String xmlStringDt = "";
Timestamp toDate = null; Timestamp toDate = null;
//Modified By Dipesh on[27/08/2019][Start]
Timestamp todateFin = null;
//Modified By Dipesh on[27/08/2019][End]
String autolveapav = ""; String autolveapav = "";
String prdCode = ""; String prdCode = "";
String procWindow = ""; String procWindow = "";
...@@ -88,9 +91,16 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -88,9 +91,16 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
String shift = ""; String shift = "";
//Modified by Rohini Telang on 12/feb/2019[Req ID: A17DSUN001][END] //Modified by Rohini Telang on 12/feb/2019[Req ID: A17DSUN001][END]
int cnt = 0; int cnt = 0;
//Modified By Dipesh on[27/08/2019][Start]
String bussinessObj = "";
//Modified By Dipesh on[27/08/2019][End]
try try
{ {
//Modified By Dipesh on[27/08/2019][Start]
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//Modified By Dipesh on[27/08/2019][End]
System.out.println("XML String :"+xmlString); System.out.println("XML String :"+xmlString);
headerDom = genericUtility.parseString(xmlString); headerDom = genericUtility.parseString(xmlString);
//System.out.println("editFlag===["+editFlag+"]xtraParams===["+xtraParams+"]"); //System.out.println("editFlag===["+editFlag+"]xtraParams===["+xtraParams+"]");
...@@ -307,8 +317,34 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -307,8 +317,34 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
xmlStringDt = getTabSeparateString(empCode, prdCode, attdDate, addOnDays ,toDate, conn);
errString = confirmAttendanceProcess("attd_daily", xmlStringDt, xtraParams, "false", conn); //Modified By Dipesh on[27/08/2019][Start]
if(procWindow != null && "L".equalsIgnoreCase(procWindow))
{
bussinessObj = "att_proc_lwp";
}
else
{
bussinessObj = "att_proc_norule";
}
System.out.println("addOnDays::::::"+addOnDays);
System.out.println("attdDate::::::"+attdDate);
System.out.println("toDate::::::"+toDate);
Calendar c = Calendar.getInstance();
c.setTime(toDate);
c.add(Calendar.DATE, -(addOnDays));
String output = sdf.format(c.getTime());
System.out.println("output::::::"+output);
todateFin = Timestamp.valueOf(genericUtility.getValidDateString(output, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("todateFin::::::"+todateFin);
//xmlStringDt = getTabSeparateString(empCode, prdCode, attdDate, addOnDays ,toDate, conn);
//errString = confirmAttendanceProcess("attd_daily", xmlStringDt, xtraParams, "false", conn);
xmlStringDt = getTabSeparateString(empCode, prdCode, attdDate, addOnDays ,todateFin, conn);
errString = confirmAttendanceProcess(bussinessObj, xmlStringDt, xtraParams, "false", conn);
//Modified By Dipesh on[27/08/2019][End]
} }
} }
} }
...@@ -443,6 +479,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -443,6 +479,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
PreparedStatement pStmt = null; PreparedStatement pStmt = null;
ResultSet rs = null; ResultSet rs = null;
System.out.println("confirmAttendanceProcess"); System.out.println("confirmAttendanceProcess");
//Modified By Dipesh on[27/08/2019][Start]
String compType = "";
//Modified By Dipesh on[27/08/2019][End]
try try
{ {
actionURI = "http://NvoServiceurl.org/" + methodName; actionURI = "http://NvoServiceurl.org/" + methodName;
...@@ -452,7 +491,10 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -452,7 +491,10 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
{ {
conn.commit(); conn.commit();
} }
sql = "SELECT SERVICE_CODE,COMP_NAME FROM SYSTEM_EVENTS WHERE OBJ_NAME = ? AND EVENT_CODE = 'process' "; //Modified By Dipesh on[27/08/2019][Start]
//sql = "SELECT SERVICE_CODE,COMP_NAME FROM SYSTEM_EVENTS WHERE OBJ_NAME = ? AND EVENT_CODE = 'process' ";
sql = "SELECT SERVICE_CODE,COMP_NAME,COMP_TYPE FROM SYSTEM_EVENTS WHERE OBJ_NAME = ? AND EVENT_CODE = 'process' ";
//Modified By Dipesh on[27/08/2019][End]
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1,businessObj); pStmt.setString(1,businessObj);
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
...@@ -460,6 +502,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -460,6 +502,9 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
{ {
serviceCode = rs.getString("SERVICE_CODE"); serviceCode = rs.getString("SERVICE_CODE");
compName = rs.getString("COMP_NAME"); compName = rs.getString("COMP_NAME");
//Modified By Dipesh on[27/08/2019][Start]
compType =rs.getString("COMP_TYPE");
//Modified By Dipesh on[27/08/2019][End]
} }
System.out.println("serviceCode = "+serviceCode+" compName "+compName); System.out.println("serviceCode = "+serviceCode+" compName "+compName);
if(rs != null) if(rs != null)
...@@ -493,7 +538,10 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att ...@@ -493,7 +538,10 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
pStmt = null; pStmt = null;
} }
//Modified by Rohini Telang on 25/March/2019[Req ID: A17DSUN001][Start] //Modified by Rohini Telang on 25/March/2019[Req ID: A17DSUN001][Start]
if(serviceURI != null && serviceURI.trim().length() > 0) //Modified By Dipesh on[27/08/2019][Start]
//if(serviceURI != null && serviceURI.trim().length() > 0)
if("WSR".equalsIgnoreCase(compType))
//Modified By Dipesh on[27/08/2019][End]
{ {
Service service = new Service(); Service service = new Service();
Call call = (Call)service.createCall(); Call call = (Call)service.createCall();
......
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