Skip to content

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

Updated componnent for not null condition : 

CadreWisePerkIC.java
GradeWisePerkIC.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215076 ce508802-f39f-4f6c-b175-0d175dae99d5
parent de39440e
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 103 deletions
webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java
View file @ f419b858
......@@ -317,10 +317,8 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
pstmt = null;
}
System.out.print("ls_accfilt:"+ls_accfilt);
//Modified by Shital on 10/01/2020 [Start]
//if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0)
if(ls_accfilt != null && ls_accfilt.trim().length() > 0)
//Modified by Shital on 10/01/2020 [End]
if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020
{
System.out.print("U R IN");
sql="select count(1) from allwdedn where ad_code = ? and " + ls_accfilt;
......
webitm-adm/src/ibase/webitm/ejb/adm/GradeWisePerkIC.java
View file @ f419b858
......@@ -99,7 +99,11 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
{
genericUtility = new E12GenericUtility();
itmDbAcess = new ITMDBAccessEJB();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//modified by Sana S on 12/11/19 [start]
//SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy");
//modified by Sana S on 12/11/19 [end]
conn = getConnection();
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
......@@ -168,21 +172,38 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
if(cnt == 0)
{
errCode="VMADC1";
/*errCode="VMADC1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMADC1" , userId, "", conn);
return errString;
}
else if(mval==mval1)
else
{
sql="select payable as mtype from allwdedn where ad_code=?";
mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
String gradeCode=checkNull(genericUtility.getColumnValue("grade_code",dom));
// effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
System.out.print("effDateStr at 433:"+effDateStr);
//sql="select count(1) as cnt from cadre_perk where ad_code= ? and ad_code__main=? and pay_table = ? and cadre_code= ? and eff_date = ?";
sql="select count(1) as cnt from grade_perk where ad_code= ? and ad_code__main=? and pay_table = ? and grade_code= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval);
pstmt.setString(2, mval1);
pstmt.setString(3, payTable);
pstmt.setString(4, gradeCode);
//pstmt.setString(5, effDateStr);
rs = pstmt.executeQuery();
if (rs.next())
{
mtype = rs.getString("mtype");
cnt = rs.getInt("cnt");
}
if (rs != null)
{
......@@ -194,12 +215,54 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
pstmt.close();
pstmt = null;
}
if(cnt > 0 && "A".equalsIgnoreCase(editFlag))
{
System.out.print("Duplicate");
/*errCode="VTDUPREC";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDUPREC" , userId, "", conn);
return errString;
}
if(!mtype.equals("P"))
mval = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code",dom));
if(mval.equals(mval1))
{
errCode="VTADTYP";
sql="select payable as mtype from allwdedn where ad_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval);
rs = pstmt.executeQuery();
String payable="P";
if (rs.next())
{
mtype = rs.getString("mtype");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(!payable.equals(mtype))
{
/*errCode="VTADTYP";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn);
return errString;
}
mval=null;
mval1=null;
}
}
......@@ -230,7 +293,6 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
pstmt = null;
}
sql="select ACC_FILT as ls_accfilt from user_rights where profile_id= ? and obj_name = ?";
pstmt = conn.prepareStatement(sql);
......@@ -253,10 +315,8 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
pstmt = null;
}
System.out.print("ls_accfilt:"+ls_accfilt);
//Modified by Shital on 10/01/2020 [Start]
//if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0)
if(ls_accfilt != null && ls_accfilt.trim().length() > 0)
//Modified by Shital on 10/01/2020 [End]
if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020
{
System.out.print("U R IN");
sql="select count(1) from allwdedn where ad_code = ? and " + ls_accfilt;
......@@ -282,9 +342,12 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
if(cnt==0)
{
errCode="VEADN1";
/*errCode="VEADN1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VEADN1" , userId, "", conn);
return errString;
}
}
}
......@@ -292,12 +355,12 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
else if ("ad_code__main".equalsIgnoreCase(childNodeName))
{
mval = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
sql="select count(1) as cnt from allwdedn where ad_code= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval);
pstmt.setString(1, mval1);
rs = pstmt.executeQuery();
if (rs.next())
......@@ -316,9 +379,12 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
if(cnt==0)
{
errCode="VMADC6";
/*errCode="VMADC6";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMADC6" , userId, "", conn);
return errString;
}
}
......@@ -326,11 +392,14 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
else if ("eff_date".equalsIgnoreCase(childNodeName))
{
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
if(effDateStr == null || effDateStr.trim().length() == 0)
if(effDateStr == null || effDateStr.length() == 0)
{
errCode="VTDATE11";
/*errCode="VTDATE11";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDATE11" , userId, "", conn);
return errString;
}
}
......@@ -339,35 +408,49 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
expDateStr = checkNull(genericUtility.getColumnValue("exp_date",dom));
Date effDate = sdf.parse( effDateStr );
Date expDate = sdf.parse( expDateStr );
if(expDateStr == null || expDateStr.trim().length() == 0)
if(expDateStr == null || expDateStr.length() == 0)
{
errCode="VTDATE22";
/*errCode="VTDATE22";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
errFields.add(childNodeName.toLowerCase());*/
if(expDate.compareTo(effDate) < 0)
errString = itmDbAcess.getErrorString("", "VTDATE22" , userId, "", conn);
return errString;
}
else
{
errCode="VMEXPDATE";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
Date effDate = sdf.parse( effDateStr );
Date expDate = sdf.parse( expDateStr );
if(expDate.compareTo(effDate) < 0)
{
/*errCode="VMEXPDATE";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMEXPDATE" , userId, "", conn);
return errString;
}
}
}
else if ("cycle_start".equalsIgnoreCase(childNodeName))
{
mval = checkNull(genericUtility.getColumnValue("ad_code",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
cycleStart=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_start", dom)));
if(mval.equals(mval1))
{
if(cycleStart < 0 || cycleStart > 12 || cycleStart == 0)
{
errCode="VMCYCLE1";
/*errCode="VMCYCLE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
}
}
}
......@@ -380,22 +463,15 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
{
if(cycleEnd < 0 || cycleEnd > 12 || cycleEnd == 0)
{
errCode="VMCYCLE1";
/*errCode="VMCYCLE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
}
}
}
else if ("validity_period".equalsIgnoreCase(childNodeName))
{
validityPrd = Integer.parseInt(checkInt(genericUtility.getColumnValue("validity_period",dom)));
if(genericUtility.getColumnValue("validity_period",dom) == null || validityPrd <= 0)
{
errCode="VTVALPRD";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else if ("amount".equalsIgnoreCase(childNodeName))
{
amount = Double.parseDouble(genericUtility.getColumnValue("amount",dom));
......@@ -404,9 +480,12 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
}
else
{
errCode="VTPAMT1";
/*errCode="VTPAMT1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTPAMT1" , userId, "", conn);
return errString;
}
}
else if ("cycle_time".equalsIgnoreCase(childNodeName))
......@@ -414,55 +493,33 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
cycleTime = Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time",dom)));
if(genericUtility.getColumnValue("cycle_time",dom) == null || cycleTime <= 0)
{
errCode="VMCYCLE1";
/*errCode="VMCYCLE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
}
}
////added by sana s on 24/10/19 [start]
mval = checkNull(genericUtility.getColumnValue("ad_code__main",dom));
mval1 = checkNull(genericUtility.getColumnValue("ad_code",dom));
String payTable=checkNull(genericUtility.getColumnValue("pay_table",dom));
String gradeCode=checkNull(genericUtility.getColumnValue("grade_code",dom));
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
sql="select count(1) as cnt from grade_perk where ad_code= ? and ad_code__main=? and pay_table = ? and grade_code= ? and eff_date = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval1);
pstmt.setString(2, mval);
pstmt.setString(3, payTable);
pstmt.setString(4, gradeCode);
pstmt.setString(5, effDateStr);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt("cnt");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(cnt==1)
else if ("validity_period".equalsIgnoreCase(childNodeName))
{
errCode="VTDUPREC";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
validityPrd = Integer.parseInt(checkInt(genericUtility.getColumnValue("validity_period",dom)));
if(genericUtility.getColumnValue("validity_period",dom) == null || validityPrd <= 0)
{
/*errCode="VTVALPRD";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTVALPRD" , userId, "", conn);
return errString;
}
}
////////added by sana s on 24/10/19 [end]
}
break;
}
}
System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
/*System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
if (errList != null && errList.size() > 0)
{
System.out.println("errList==[" + errList + "]");
......@@ -495,7 +552,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
errFields.clear();
}
errStringXml.append("</Errors></Root>\r\n");
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());
System.out.println("errStringXml.toString()---2= "+errStringXml.toString());*/
}
catch (Exception e)
{
......@@ -529,7 +586,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
throw new ITMException(e);
}
}
errString = errStringXml.toString();
//errString = errStringXml.toString();
return errString;
}
......@@ -585,7 +642,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
String adExpDate = "";
String adCode = "";
String sql = "";
String descr = "";
String descr = "",lastProcDate="";
AdmCommon admCommon = new AdmCommon();
String lastProcFor="";
int cycleTime = 0;
......@@ -643,6 +700,19 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
AdmCommon.setNodeValue(dom, "exp_date", adExpDate);
System.out.println("dom==["+genericUtility.serializeDom(dom)+"]");
//Added by Sana S for last process date on 15/11/19 [start]
lastProcDate =sdf.format(new Date());
valueXmlString.append("<last_proc_for ><![CDATA[").append(lastProcDate).append("]]></last_proc_for>\r\n");
AdmCommon.setNodeValue(dom, "last_proc_for", lastProcDate);
proccFor=sdf.parse(lastProcDate);
cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1 =sdf.format(nextProcDate);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
//Added by Sana S for last process date on 15/11/19 [end]
}
else if ("ad_code".equalsIgnoreCase(currentColumn))
{
......@@ -673,13 +743,18 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
{
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
System.out.println("lastProcFor"+lastProcFor);
//Modified by Sana S on 25/10/19
if(!lastProcFor.equals(null))
if(lastProcFor.equals(null) || lastProcDate.length() > 0 || lastProcFor.equals(""))
{
valueXmlString.append("<next_proc_date><![CDATA[").append("").append("]]></next_proc_date>\r\n");
}
else
{
proccFor=sdf.parse(lastProcFor);
System.out.println("proccFor"+proccFor);
cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
......@@ -688,11 +763,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
System.out.println("Date ::::"+nextProcDate1);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
}
else
{
valueXmlString.append("<next_proc_date><![CDATA[").append("").append("]]></next_proc_date>\r\n");
}
}
else if ("cycle_time".equalsIgnoreCase(currentColumn))
{
......@@ -704,7 +775,7 @@ public class GradeWisePerkIC extends ValidatorEJB implements GradeWisePerkLocal,
nextProcDate = utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1 = sdf.format(nextProcDate);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1)
.append("]]></next_proc_date>\r\n");
.append("]]></next_proc_date>\r\n");
}
else
{
......
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