Skip to content

B
business-java
Commit eb810cd7 authored by sghate's avatar sghate
Browse files
Options

Updated component for Relieve Date and status change changes. 

ReportToChangeIC.java
ReportToChangePrc.java




git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215205 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dfe0e7f8
Show whitespace changes
Inline Side-by-side
Showing with 350 additions and 298 deletions
webitm-adm/src/ibase/webitm/ejb/adm/ReportToChangeIC.java
View file @ eb810cd7
......@@ -4,6 +4,7 @@ import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
//import java.text.SimpleDateFormat;
import java.util.ArrayList;
//import java.util.Date;
......@@ -23,7 +24,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag,
String xtraParams) throws RemoteException, ITMException
{
System.out.println(xmlString);
Document dom = null;
Document dom1 = null;
......@@ -56,7 +56,7 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
e.printStackTrace();
throw new ITMException(e);
}
System.out.println("returning from ReportToChangeIC wfvaldata");
System.out.println("returning from ReportToChangeIC wfvaldata"+errString);
return errString;
}
......@@ -87,6 +87,11 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
int noOfChilds = 0;
int cnt = 0;
int counter;
//Added by Shital on 08/01/2020[Start]
String status = "";
Timestamp relieveDate = null;
Timestamp currentDate = null;
//Added by Shital on 08/01/2020[End]
E12GenericUtility genericUtility = null;
errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
......@@ -101,6 +106,7 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
conn = getConnection();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
//loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSite");
currentDate = new Timestamp(System.currentTimeMillis()); //Added by Shital on 08/01/2020
System.out.println("Line no----");
if (objContext != null && objContext.trim().length() > 0)
{
......@@ -122,6 +128,7 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
System.out.println("counter>>>" + counter);
reportingType = checkNull(genericUtility.getColumnValue("reporting_type", dom));
System.out.println("------reportingType----"+reportingType);
switch (currentFormNo)
{
......@@ -184,15 +191,21 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
empCodeTo = checkNull(genericUtility.getColumnValue("emp_code__to", dom));
cnt = 0;
sql = "select count(*) as cnt from employee where emp_code = ?";
/*sql = "select count(*) as cnt from employee where emp_code = ?";*/
//sql = "select count(*) as cnt,status,relieve_date from employee where emp_code = ? group by STATUS,RELIEVE_DATE"; //Added by Shital on 08/01/2020
sql = "select status,relieve_date from employee where emp_code = ?"; //Added by Shital on 08/01/2020
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCodeTo);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
//cnt = rs.getInt("cnt");
status = checkNull(rs.getString("status"));
relieveDate = rs.getTimestamp("relieve_date"); //Added by Shital on 08/01/2020
}
System.out.println("cnt:::: " + cnt+editFlag);
System.out.println("cnt:::: " + cnt);
System.out.println("status:::: " + status);
System.out.println("relieveDate:::: " + relieveDate);
if (rs != null)
{
rs.close();
......@@ -203,10 +216,25 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
pstmt.close();
pstmt = null;
}
if(cnt != 1)
/*if(cnt != 1)
{
errList.add("VMEMP20");
errFields.add(childNodeName.toLowerCase());
}*/
if("S".equalsIgnoreCase(status)) //Added by Shital on 08/01/2020
{
System.out.println("::::#Status::::");
errList.add("VMEMPREP01"); //Employee is Already Separated.
errFields.add(childNodeName.toLowerCase());
}
else
{
if(relieveDate != null && relieveDate.before(currentDate)) //Added by Shital on 08/01/2020
{
System.out.println("::::#relieveDate::::");
errList.add("VMEMPREP0"); //Relieve date of Report To should not less than Current date.
errFields.add(childNodeName.toLowerCase());
}
}
}
}
......@@ -253,15 +281,20 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
empCodeAdminTo = checkNull(genericUtility.getColumnValue("emp_code__admin_to", dom));
cnt = 0;
sql = "select count(*) as cnt from employee where emp_code = ?";
/*sql = "select count(*) as cnt from employee where emp_code = ?";*/
sql = "select status,relieve_date from employee where emp_code = ?"; //Added by Shital on 08/01/2020
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCodeAdminTo);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
//cnt = rs.getInt("cnt");
status = checkNull(rs.getString("status"));
relieveDate = rs.getTimestamp("relieve_date"); //Added by Shital on 08/01/2020
}
System.out.println("cnt:::: " + cnt+editFlag);
//System.out.println("cnt2:::: " + cnt);
System.out.println("status2:::: " + status);
System.out.println("relieveDate2:::: " + relieveDate);
if (rs != null)
{
rs.close();
......@@ -272,10 +305,25 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
pstmt.close();
pstmt = null;
}
if(cnt != 1)
/*if(cnt != 1)
{
errList.add("VMEMP20");
errFields.add(childNodeName.toLowerCase());
}*/
if("S".equalsIgnoreCase(status)) //Added by Shital on 08/01/2020
{
System.out.println("::::#Status###::::");
errList.add("VMEMPREP02"); //Employee is Already Separated.
errFields.add(childNodeName.toLowerCase());
}
else
{
if(relieveDate != null && relieveDate.before(currentDate)) //Added by Shital on 08/01/2020
{
System.out.println("::::#relieveDate###::::");
errList.add("VMEMPREP03"); //Relieve date of Report To Admin should not less than Current date.
errFields.add(childNodeName.toLowerCase());
}
}
}
}
......@@ -315,8 +363,12 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
}
errList.clear();
errFields.clear();
}
errStringXml.append("</Errors></Root>\r\n");
}
else
{
errStringXml = new StringBuffer( "" );
}
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
}
catch (Exception e)
......@@ -427,7 +479,7 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
genericUtility = new E12GenericUtility();
//SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//todayStr = sdf.format(new Date());
System.out.println("currentFormNo...." + currentFormNo);
conn = getConnection();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSite");
......@@ -435,6 +487,7 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
{
currentFormNo = Integer.parseInt(objContext);
}
System.out.println("currentFormNo...." + currentFormNo);
valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<editFlag>");
valueXmlString.append(editFlag).append("</editFlag>\r\n</Header>\r\n");
System.out.println("current form no: " + currentFormNo);
......@@ -463,18 +516,58 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
}
}
switch (currentFormNo)
{
case 1:
{
System.out.println("=========================================Case1============================");
valueXmlString.append("<Detail1>\r\n");
if ("reporting_type".equalsIgnoreCase(currentColumn))
if("itm_default".equalsIgnoreCase(currentColumn)) //Modified by Shital on 08/01/2020
{
reportingType = checkNull(genericUtility.getColumnValue("reporting_type", dom));
System.out.println("inside item default::::");
if(loginSite != null && loginSite.trim().length() > 0)
{
valueXmlString.append("<site_code__fr ><![CDATA[").append(loginSite).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_code__to ><![CDATA[").append(loginSite).append("]]></site_code__to>\r\n");
sql = "select descr as ls_descr from site where site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginSite);
rs = pstmt.executeQuery();
if (rs.next())
{
lsDescr = checkNull(rs.getString("ls_descr"));
}
System.out.println("---------lsDescr------"+lsDescr);
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(reportingType.equalsIgnoreCase("R"))
valueXmlString.append("<site_code__fr_descr ><![CDATA[").append(lsDescr).append("]]></site_code__fr_descr>\r\n");
valueXmlString.append("<site_code__to_descr ><![CDATA[").append(lsDescr).append("]]></site_code__to_descr>\r\n");
}
if(mlevl > 1)
{
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append(loginSite).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_code__to protect=\"1\"><![CDATA[").append(loginSite).append("]]></site_code__to>\r\n");
}
}
else if ("reporting_type".equalsIgnoreCase(currentColumn))
{
reportingType = checkNull(genericUtility.getColumnValue("reporting_type", dom));
System.out.println("reportingType!!!!!!!!!!!!!!"+reportingType);
//if(reportingType.equalsIgnoreCase("R"))
if("R".equalsIgnoreCase(reportingType)) //Modified by Shital on 08/01/2020
{
valueXmlString.append("<emp_code__fr protect=\"0\"><![CDATA[").append("").append("]]></emp_code__fr>\r\n");
valueXmlString.append("<emp_code__to protect=\"0\"><![CDATA[").append("").append("]]></emp_code__to>\r\n");
......@@ -507,7 +600,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
itemChanged(dom1, dom2, objContext,"emp_code__admin_to", editFlag, xtraParams);
}
}
else if("emp_code__admin_fr".equalsIgnoreCase(currentColumn))
{
empCodeAdminFr = checkNull(genericUtility.getColumnValue("emp_code__admin_fr", dom));
......@@ -537,7 +629,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
modStr = empFname+" "+empMname+" "+empLname;
valueXmlString.append("<emp_code_admin__fr_name><![CDATA[").append(modStr).append("]]></emp_code_admin__fr_name>\r\n");
}
else if("emp_code__admin_to".equalsIgnoreCase(currentColumn))
{
empCodeAdminTo = checkNull(genericUtility.getColumnValue("emp_code__admin_to", dom));
......@@ -568,7 +659,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
modStr = empFname+" "+empMname+""+empLname;
valueXmlString.append("<emp_code_admin__to_name ><![CDATA[").append(modStr).append("]]></emp_code_admin__to_name>\r\n");
}
else if("emp_code__fr".equalsIgnoreCase(currentColumn))
{
empCodeFr = checkNull(genericUtility.getColumnValue("emp_code__fr", dom));
......@@ -598,7 +688,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
modStr = empFname+" "+empMname+""+empLname;
valueXmlString.append("<emp_name__fr ><![CDATA[").append(modStr).append("]]></emp_name__fr>\r\n");
}
else if("emp_code__to".equalsIgnoreCase(currentColumn))
{
empCodeTo = checkNull(genericUtility.getColumnValue("emp_code__to", dom));
......@@ -629,44 +718,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
modStr = empFname+" "+empMname+""+empLname;
valueXmlString.append("<emp_name__to ><![CDATA[").append(modStr).append("]]></emp_name__to>\r\n");
}
else if("itm_default".equalsIgnoreCase(currentColumn))
{
if(loginSite != null && loginSite.trim().length() > 0)
{
valueXmlString.append("<site_code__fr ><![CDATA[").append(loginSite).append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_code__to ><![CDATA[").append(loginSite).append("]]></site_code__to>\r\n");
sql = "select descr as ls_descr from site where site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginSite);
rs = pstmt.executeQuery();
if (rs.next())
{
lsDescr = checkNull(rs.getString("ls_descr"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
valueXmlString.append("<site_code__fr_descr ><![CDATA[").append(lsDescr).append("]]></site_code__fr_descr>\r\n");
valueXmlString.append("<site_code__to_descr ><![CDATA[").append(lsDescr).append("]]></site_code__to_descr>\r\n");
}
if(mlevl > 1)
{
valueXmlString.append("<site_code__fr protect=\"1\"><![CDATA[").append("").append("]]></site_code__fr>\r\n");
valueXmlString.append("<site_code__to protect=\"1\"><![CDATA[").append("").append("]]></site_code__to>\r\n");
}
}
else if("site_code__fr".equalsIgnoreCase(currentColumn))
{
siteCodeFr = checkNull(genericUtility.getColumnValue("site_code__fr", dom));
......@@ -693,7 +744,6 @@ public class ReportToChangeIC extends ValidatorEJB implements ReportToChangeLoca
valueXmlString.append("<site_code__fr_descr ><![CDATA[").append(msetval).append("]]></site_code__fr_descr>\r\n");
}
else if("site_code__to".equalsIgnoreCase(currentColumn))
{
siteCodeTo = checkNull(genericUtility.getColumnValue("site_code__to", dom));
......
webitm-adm/src/ibase/webitm/ejb/adm/ReportToChangePrc.java
View file @ eb810cd7
......@@ -128,7 +128,10 @@ public class ReportToChangePrc extends ProcessEJB //implements ReportToChangePrc
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
ldTranDateStr = sdf.format(new java.util.Date());
if(ldTranDateStr != null && ldTranDateStr.trim().length() > 0) //Added by Shital on 08/01/2020
{
ldTranDate = Timestamp.valueOf(genericUtility.getValidDateString(ldTranDateStr,genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("ldToday ["+ldToday+"] \t ldTranDate ["+ldTranDate+"]");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
......@@ -148,6 +151,7 @@ public class ReportToChangePrc extends ProcessEJB //implements ReportToChangePrc
{
mkeyStr = checkNull(rs.getString("mkeystr"));
}
System.out.println("mkeystr:::::::::::"+mkeyStr); //Added by Shital on 08/01/2020
if(rs != null)
{
rs.close();
......@@ -161,7 +165,6 @@ public class ReportToChangePrc extends ProcessEJB //implements ReportToChangePrc
}
System.out.println("mkeyStr:["+mkeyStr+"]");
lsReportingType = genericUtility.getColumnValue("reporting_type", headerDom);
lsSiteCodeFr = genericUtility.getColumnValue("site_code__fr", headerDom);
lsSiteCodeTo = genericUtility.getColumnValue("site_code__to", headerDom);
......@@ -191,8 +194,6 @@ public class ReportToChangePrc extends ProcessEJB //implements ReportToChangePrc
System.out.println("emp_code__fr ["+lsEmpCode+"] \t emp_code__to ["+lsReportTo+"] "
+ "\t emp_code__admin_fr ["+lsEmpCode+"] \t emp_code__admin_to ["+lsReportTo+"]");
sql= "SELECT EMPLOYEE.EMP_CODE, "
+ "EMPLOYEE.REPORT_TO, "
+ "EMPLOYEE.REPORT_TO__ADMIN "
......@@ -353,7 +354,8 @@ public class ReportToChangePrc extends ProcessEJB //implements ReportToChangePrc
public String gbfPostLogic(String tranId, int aiCommit , String xtraParams,Connection conn) throws ITMException
{
String lsTranid = "" , lsConfirm = "" , lsTranType = "" , lsReportToN = "", lsReportToAdminN = "" ,lsEmpCode = "";
Timestamp ldToday = null;
//Timestamp ldToday = null;
java.sql.Timestamp ldToday = null;
String sql = "" , sql1 = "";
String userId = "" , chgTerm = "" , loginEmpCode = "", errString = "";
PreparedStatement pstmt = null , pstmt1 = null;
......@@ -361,7 +363,7 @@ public class ReportToChangePrc extends ProcessEJB //implements ReportToChangePrc
try
{
System.out.println(" ************** Inside Post Logic Method ****************");
System.out.println("************** Inside Post Logic Method ****************");
userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
......
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