Skip to content

B
business-java
Commit 337a5b02 authored by sanashaikh's avatar sanashaikh
Browse files
Options

Sana S: Modified on 14/11/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@211993 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 46d31673
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 103 deletions
webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java
View file @ 337a5b02
...@@ -169,9 +169,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -169,9 +169,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
} }
if(cnt == 0) if(cnt == 0)
{ {
errCode="VMADC1"; /*errCode="VMADC1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMADC1" , userId, "", conn);
return errString;
} }
else else
{ {
...@@ -200,9 +202,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -200,9 +202,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
if(!mtype.equals("P")) if(!mtype.equals("P"))
{ {
errCode="VTADTYP"; /*errCode="VTADTYP";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTADTYP" , userId, "", conn);
return errString;
} }
} }
} }
...@@ -282,9 +286,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -282,9 +286,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
if(cnt==0) if(cnt==0)
{ {
errCode="VEADN1"; /*errCode="VEADN1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VEADN1" , userId, "", conn);
return errString;
} }
} }
} }
...@@ -316,9 +322,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -316,9 +322,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
} }
if(cnt==0) if(cnt==0)
{ {
errCode="VMADC6"; /*errCode="VMADC6";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMADC6" , userId, "", conn);
return errString;
} }
} }
...@@ -331,9 +339,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -331,9 +339,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
{ {
if(cycleStart < 0 || cycleStart > 12 || cycleStart == 0) if(cycleStart < 0 || cycleStart > 12 || cycleStart == 0)
{ {
errCode="VMCYCLE1"; /*errCode="VMCYCLE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
} }
} }
} }
...@@ -347,22 +358,28 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -347,22 +358,28 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
{ {
if(cycleEnd < 0 || cycleEnd > 12 || cycleEnd == 0) if(cycleEnd < 0 || cycleEnd > 12 || cycleEnd == 0)
{ {
errCode="VMCYCLE1"; /*errCode="VMCYCLE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
} }
} }
} }
else if ("eff_date".equalsIgnoreCase(childNodeName)) else if ("eff_date".equalsIgnoreCase(childNodeName))
{ {
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom)); effDateStr = genericUtility.getColumnValue("eff_date",dom);
System.out.println("effDateStr ::::"+effDateStr); System.out.println("effDateStr ::::"+effDateStr);
if(effDateStr == null || effDateStr.trim().length() == 0) if(effDateStr == null || effDateStr.trim().length() == 0 || effDateStr=="")
{ {
errCode="VTDATE11"; /*errCode="VTDATE11";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDATE11" , userId, "", conn);
return errString;
} }
} }
...@@ -371,11 +388,13 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -371,11 +388,13 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom)); effDateStr = checkNull(genericUtility.getColumnValue("eff_date",dom));
expDateStr = checkNull(genericUtility.getColumnValue("exp_date",dom)); expDateStr = checkNull(genericUtility.getColumnValue("exp_date",dom));
if(expDateStr == null || expDateStr.trim().length() == 0) if(expDateStr == null || expDateStr.trim().length() == 0 || expDateStr.equals(""))
{ {
errCode="VTDATE22"; /*errCode="VTDATE22";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTDATE22" , userId, "", conn);
return errString;
} }
else else
{ {
...@@ -384,13 +403,16 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -384,13 +403,16 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
System.out.println("effDate ::::"+effDate); System.out.println("effDate ::::"+effDate);
System.out.println("expDate ::::"+expDate); System.out.println("expDate ::::"+expDate);
}
if(expDate.compareTo(effDate) < 0)
if(expDate.compareTo(effDate) < 0) {
{ /*errCode="VMEXPDATE";
errCode="VMEXPDATE"; errList.add(errCode);
errList.add(errCode); errFields.add(childNodeName.toLowerCase());*/
errFields.add(childNodeName.toLowerCase());
errString = itmDbAcess.getErrorString("", "VMEXPDATE" , userId, "", conn);
return errString;
}
} }
} }
...@@ -399,9 +421,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -399,9 +421,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
validityPrd = Integer.parseInt(checkInt(genericUtility.getColumnValue("validity_period",dom))); validityPrd = Integer.parseInt(checkInt(genericUtility.getColumnValue("validity_period",dom)));
if(genericUtility.getColumnValue("validity_period",dom) == null || validityPrd <= 0) if(genericUtility.getColumnValue("validity_period",dom) == null || validityPrd <= 0)
{ {
errCode="VTVALPRD"; /*errCode="VTVALPRD";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTVALPRD" , userId, "", conn);
return errString;
} }
} }
...@@ -410,9 +435,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -410,9 +435,12 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
amount = Double.parseDouble(checkInt(genericUtility.getColumnValue("amount",dom))); amount = Double.parseDouble(checkInt(genericUtility.getColumnValue("amount",dom)));
if(genericUtility.getColumnValue("amount",dom) == null || amount <= 0) if(genericUtility.getColumnValue("amount",dom) == null || amount <= 0)
{ {
errCode="VTPAMT1"; /*errCode="VTPAMT1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VTPAMT1" , userId, "", conn);
return errString;
} }
} }
...@@ -421,60 +449,20 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -421,60 +449,20 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
cycleTime = Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time",dom))); cycleTime = Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time",dom)));
if(genericUtility.getColumnValue("cycle_time",dom) == null || cycleTime < 0) if(genericUtility.getColumnValue("cycle_time",dom) == null || cycleTime < 0)
{ {
errCode="VMCYCLE1"; /*errCode="VMCYCLE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
errString = itmDbAcess.getErrorString("", "VMCYCLE1" , userId, "", conn);
return errString;
} }
} }
//Comment by Sana S on 12/11/19 [start]
/*////added by sana s on 17/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 cadreCode=checkNull(genericUtility.getColumnValue("cadre_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 = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval1);
pstmt.setString(2, mval);
pstmt.setString(3, payTable);
pstmt.setString(4, cadreCode);
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)
{
errCode="VTDUPREC";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
////////added by sana s on 17/10/19 [end]
*/
//Comment by Sana S on 12/11/19 [start]
} }
break; break;
} }
} }
System.out.println("errStringXml.toString()---1= "+errStringXml.toString()); /*System.out.println("errStringXml.toString()---1= "+errStringXml.toString());
if (errList != null && errList.size() > 0) if (errList != null && errList.size() > 0)
{ {
System.out.println("errList==[" + errList + "]"); System.out.println("errList==[" + errList + "]");
...@@ -507,7 +495,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -507,7 +495,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
errFields.clear(); errFields.clear();
} }
errStringXml.append("</Errors></Root>\r\n"); 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) catch (Exception e)
{ {
...@@ -542,7 +530,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -542,7 +530,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
throw new ITMException(e); throw new ITMException(e);
} }
} }
errString = errStringXml.toString(); //errString = errStringXml.toString();
return errString; return errString;
} }
...@@ -583,6 +571,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -583,6 +571,7 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
return valueXmlString; return valueXmlString;
} }
@SuppressWarnings("null")
public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn,
String editFlag, String xtraParams) throws RemoteException, ITMException String editFlag, String xtraParams) throws RemoteException, ITMException
{ {
...@@ -596,9 +585,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -596,9 +585,11 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
String cadreCode = ""; String cadreCode = "";
String adEffDate = ""; String adEffDate = "";
String adExpDate = ""; String adExpDate = "";
String adEffDate1 = "";
String adExpDate1 = "";
String adCode = ""; String adCode = "";
String sql = ""; String sql = "";
String descr = ""; String descr = "",lastProcDate="";
AdmCommon admCommon = new AdmCommon(); AdmCommon admCommon = new AdmCommon();
String lastProcFor=""; String lastProcFor="";
int cycleTime = 0; int cycleTime = 0;
...@@ -612,8 +603,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -612,8 +603,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
{ {
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
//sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
sdf = new SimpleDateFormat("dd/MM/yy"); // Modified by Sana S on 08/11/19 //sdf = new SimpleDateFormat("dd/MM/yy"); // Modified by Sana S on 08/11/19
System.out.println("currentFormNo...." + currentFormNo); System.out.println("currentFormNo...." + currentFormNo);
conn = getConnection(); conn = getConnection();
if (objContext != null && objContext.trim().length() > 0) if (objContext != null && objContext.trim().length() > 0)
...@@ -645,20 +638,26 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -645,20 +638,26 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
AdmCommon.setNodeValue(dom, "cadre_code", cadreCode); AdmCommon.setNodeValue(dom, "cadre_code", cadreCode);
adEffDate = admCommon.getEnv("999999", "AD_EFFDATE", conn); adEffDate = admCommon.getEnv("999999", "AD_EFFDATE", conn);
System.out.println("lsVarValue==["+adEffDate+"]"); System.out.println("lsVarValue==["+adEffDate.trim()+"]");
System.out.println("genericUtility.getApplDateFormat()==["+genericUtility.getApplDateFormat()+"]"); System.out.println("genericUtility.getApplDateFormat()==["+genericUtility.getApplDateFormat()+"]");
adEffDate = genericUtility.getValidDateString(adEffDate,"dd-MM-yy", genericUtility.getApplDateFormat()); adEffDate1 = genericUtility.getValidDateString(adEffDate.trim(),"dd-MM-yy", genericUtility.getApplDateFormat());
System.out.println("lsVarValue==after["+adEffDate+"]"); System.out.println("lsVarValue==after["+adEffDate1+"]");
adExpDate = admCommon.getEnv("999999", "AD_EXPDATE", conn); adExpDate = admCommon.getEnv("999999", "AD_EXPDATE", conn);
adExpDate = genericUtility.getValidDateString(adExpDate, "dd-MM-yy", genericUtility.getApplDateFormat()); adExpDate1 = genericUtility.getValidDateString(adExpDate.trim(), "dd-MM-yy", genericUtility.getApplDateFormat());
System.out.println("lsVarValue==after["+adExpDate1+"]");
valueXmlString.append("<eff_date ><![CDATA[").append(adEffDate).append("]]></eff_date>\r\n");
AdmCommon.setNodeValue(dom, "eff_date", adEffDate); valueXmlString.append("<eff_date ><![CDATA[").append(adEffDate1).append("]]></eff_date>\r\n");
AdmCommon.setNodeValue(dom, "eff_date", adEffDate1);
valueXmlString.append("<exp_date ><![CDATA[").append(adExpDate).append("]]></exp_date>\r\n");
AdmCommon.setNodeValue(dom, "exp_date", adExpDate); valueXmlString.append("<exp_date ><![CDATA[").append(adExpDate1).append("]]></exp_date>\r\n");
AdmCommon.setNodeValue(dom, "exp_date", adExpDate1);
System.out.println("dom==["+genericUtility.serializeDom(dom)+"]"); System.out.println("dom==["+genericUtility.serializeDom(dom)+"]");
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", adExpDate1);
/*valueXmlString.append("<cadre_code protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n"); /*valueXmlString.append("<cadre_code protect=\"1\"><![CDATA[").append(cadreCode).append("]]></cadre_code>\r\n");
valueXmlString.append("<pay_table protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");*/ valueXmlString.append("<pay_table protect=\"1\"><![CDATA[").append(payTable).append("]]></pay_table>\r\n");*/
...@@ -693,7 +692,13 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -693,7 +692,13 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
{ {
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom)); lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
System.out.println("lastProcFor"+lastProcFor.length()); System.out.println("lastProcFor"+lastProcFor.length());
if (!lastProcFor.equals(null) || !lastProcFor.equals("") || lastProcFor.length() > 0) if (lastProcFor.equals(null) || lastProcFor.equals("") || lastProcFor.length() == 0)
{
valueXmlString.append("<next_proc_date><![CDATA[").append("")
.append("]]></next_proc_date>\r\n");
}
else
{ {
proccFor=sdf.parse(lastProcFor); proccFor=sdf.parse(lastProcFor);
System.out.println("proccFor"+proccFor); System.out.println("proccFor"+proccFor);
...@@ -705,22 +710,20 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal, ...@@ -705,22 +710,20 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
System.out.println("Date ::::"+nextProcDate1); System.out.println("Date ::::"+nextProcDate1);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n"); 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)) else if ("cycle_time".equalsIgnoreCase(currentColumn))
{ {
lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom)); lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));
proccFor=sdf.parse(lastProcFor); if(lastProcFor != null || lastProcFor.trim().length() > 0 || lastProcFor != "")
{
proccFor=sdf.parse(lastProcFor);
cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom))); cycleTime=Integer.parseInt(checkInt(genericUtility.getColumnValue("cycle_time", dom)));
nextProcDate=utilMethods.AddMonths(proccFor, cycleTime); nextProcDate=utilMethods.AddMonths(proccFor, cycleTime);
nextProcDate1 =sdf.format(nextProcDate); nextProcDate1 =sdf.format(nextProcDate);
valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n"); valueXmlString.append("<next_proc_date><![CDATA[").append(nextProcDate1).append("]]></next_proc_date>\r\n");
}
} }
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
......
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