Skip to content

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

Updated component on 14/02/2020 

StatusChangeConfirm.java
StatusChangeIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216628 ce508802-f39f-4f6c-b175-0d175dae99d5
parent aa7318a3
Show whitespace changes
Inline Side-by-side
Showing with 803 additions and 777 deletions
webitm-adm/src/ibase/webitm/ejb/adm/StatusChangeConfirm.java
View file @ d06c2c00
......@@ -35,8 +35,8 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
retString = gbfPostLogic(tranId,xtraParams,forcedFlag,conn);
System.out.println("returning String from StatusChangeConfirm :confirm():==>[" + retString + "]");
if(retString == null || retString.trim().length() == 0)
//Modified by shital on 14/02/2020 [Start]
/*if(retString == null || retString.trim().length() == 0)
{
isError = false;
retString = itmDBAccessEJB.getErrorString("", "VTINVCONF3", "", "", conn);
......@@ -46,7 +46,17 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
else
{
isError = true;
}*/
if(retString != null && retString.trim().length() > 0 && retString.indexOf("VTINVCONF3")<0)
{
conn.rollback();
}
else
{
conn.commit();
retString = itmDBAccessEJB.getErrorString("","VTINVCONF3" , "", "", conn);
}
//Modified by shital on 14/02/2020 [End]
}
catch(Exception e)
{
......@@ -58,9 +68,9 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
{
try
{
if(conn != null)
if(conn != null) //Modified by shital on 14/02/2020
{
if(isError)
/*if(isError)
{
conn.rollback();
System.out.println("Connection rollback");
......@@ -70,7 +80,7 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
conn.commit();
System.out.println("Connection committed");
}
}*/
conn.close();
conn = null;
}
......@@ -132,7 +142,7 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
{
ldTranDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(tranDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
}
System.out.println("ldTranDate:::::::::=="+ldTranDate);
sql = "select case when confirm is null then 'N' else confirm end as confirm ,"
+ " tran_id ,"
+ " remarks "
......@@ -177,12 +187,12 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
else if("X".equalsIgnoreCase(confirm))
{
errString = itmDBAccessEJB.getErrorString("", "VTEMPSTS02", userId, "", conn);
return errString;
//return errString;
}
else
{
errString = itmDBAccessEJB.getErrorString("", "VTMCONF1", userId, "", conn);
return errString;
//return errString;
}
if(errString == null || errString.trim().length() == 0)
......@@ -240,6 +250,7 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
pstmt = null;
}
liCnt = 0;
if(liCnt > 0)
{
liCnt = 0;
......@@ -263,15 +274,17 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
pstmt = null;
}
}
else
/*else //Commented by shital on 14/02/2020
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
}*/
}
}
else
/*else
{
errString = itmDBAccessEJB.getErrorString("", "DS000", userId, "", conn);
}
}*/ //Commented by shital on 14/02/2020
int cnt1 = 0;
sql = "update wf_prc_status "
+ "set "
+ "process_status = 3, "
......@@ -281,7 +294,7 @@ public class StatusChangeConfirm extends ActionHandlerEJB implements StatusChang
+ "and process_status < 3";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
int cnt1 = pstmt.executeUpdate();
cnt1 = pstmt.executeUpdate();
if(cnt1 > 0)
{
System.out.println("Data Updated in wf_prc_status table..");
......
webitm-adm/src/ibase/webitm/ejb/adm/StatusChangeIC.java
View file @ d06c2c00
......@@ -188,7 +188,7 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
{
errCode = checkNull(finCommon.nfCheckPeriod("ADM", dateEffchg, lsSite, conn));
}
if(errCode != null && errCode.trim().length() > 0)
else if(errCode != null && errCode.trim().length() > 0)
{
if("VTPRD2".equalsIgnoreCase(errCode))
{
......@@ -826,7 +826,9 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
+ "and case when active is null then 'Y' else active end = 'Y' "
+ "and fld_value = ? and udf_str1 = ? and udf_str2 = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, statusType);
pstmt.setString(1, reasonCode);
pstmt.setString(2, statusType);
pstmt.setString(3, extend);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -1025,7 +1027,9 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
String lsDesignCode = "";
String lsDesignation = "";
String lsEligibleOt = "";
String tranDate = "";
//String tranDate = "";
String tranDateStr = "";
Timestamp tranDate = null;
String extend = "";
String gradeCode = "";
String cadreCode = "";
......@@ -1062,16 +1066,18 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
if("itm_default".equalsIgnoreCase(currentColumn))
{
System.out.println("Inside item default ===========");
monthsExtend = checkNull(genericUtility.getColumnValue("months_extend", dom));
System.out.println("tranDateStr####"+tranDateStr);
System.out.println("months_extend :: ["+monthsExtend+"]");
valueXmlString.append("<extend>").append("<![CDATA[N]]>").append("</extend>");
valueXmlString.append("<tran_date><![CDATA[").append(sdf.format(new java.util.Date())).append("]]></tran_date>\r\n");
//valueXmlString.append("<tran_date>").append(tranDateStr).append("</tran_date>");
valueXmlString.append("<months_extend protect='1'>").append("<![CDATA[" + monthsExtend + "]]>").append("</months_extend>\r\n");
valueXmlString.append("<confirm>").append("<![CDATA[N]]>").append("</confirm>");
valueXmlString.append("<notice_prd>").append("<![CDATA[0]]>").append("</notice_prd>");
}
else if("emp_code".equalsIgnoreCase(currentColumn))
{
......@@ -1186,6 +1192,7 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
{
dateConfStr = "";
}
//Added by Shital on 13/12/2019 [End]
/*if(probationDateStr != null && probationDateStr.trim().length() > 0)
{
......@@ -1251,11 +1258,12 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
{
if("Y".equalsIgnoreCase(probation) && "N".equalsIgnoreCase(confirmed))
{
System.out.println("dateConfStr111111111"+dateConfStr);
valueXmlString.append("<status_type>").append("<![CDATA[C]]>").append("</status_type>");
valueXmlString.append("<date__due_chg>").append("<![CDATA[" + dateConfStr + "]]>").append("</date__due_chg>");
valueXmlString.append("<date__effchg>").append("<![CDATA[" + dateConfStr + "]]>").append("</date__effchg>");
}
System.out.println("dateConfStr111111111"+dateConfStr);
}
if("A".equalsIgnoreCase(editFlag))
{
......@@ -1264,14 +1272,19 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
}
else if("tran_date".equalsIgnoreCase(currentColumn))
{
System.out.println("::::: Inside Tran_Date :::::");
if("A".equalsIgnoreCase(editFlag))
{
tranDate = checkNull(genericUtility.getColumnValue("tran_date", dom));
valueXmlString.append("<tran_date_orig>").append("<![CDATA[" + tranDate + "]]>").append("</tran_date_orig>");
//tranDate = checkNull(genericUtility.getColumnValue("tran_date", dom));
tranDateStr = checkNull(genericUtility.getColumnValue("tran_date", dom));
valueXmlString.append("<tran_date_orig><![CDATA[").append(tranDateStr).append("]]></tran_date_orig>\r\n");
//valueXmlString.append("<tran_date_orig>").append("<![CDATA[" + tranDate + "]]>").append("</tran_date_orig>");
}
System.out.println("tranDateStr=========="+tranDateStr);
}
else if("extend".equalsIgnoreCase(currentColumn))
{
System.out.println("=====extend====");
extend = checkNull(genericUtility.getColumnValue("extend", dom));
monthsExtend = checkNull(genericUtility.getColumnValue("months_extend", dom));
if("N".equalsIgnoreCase(extend))
......
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