Skip to content

B
business-java
Commit 40386226 authored by nsawalakhe's avatar nsawalakhe
Browse files
Options

Changes in sql . 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102155 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5cade3e5
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 27 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2.java
View file @ 40386226
...@@ -26,9 +26,9 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -26,9 +26,9 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getComplianceDetailsDb2(String loginId,String dataSourceName,String period) throws RemoteException, ITMException public JSONObject getComplianceHirarchyDB2(String loginId,String dataSourceName,String period) throws RemoteException, ITMException
{ {
JSONObject rawDataComplianceDetailsDb2Json = new JSONObject(); JSONObject rawDataComplianceHirarchyDB2Json = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
String sql = ""; String sql = "";
ResultSet rs = null; ResultSet rs = null;
...@@ -37,7 +37,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -37,7 +37,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ComplianceEJB for getComplianceDetailsDb2 Data Soruc Namem 11 ="+dataSourceName+" loginId=:"+ loginId+"---- month=:"+ period); System.out.println(" Inside ComplianceDB2 for getComplianceHirarchyDB2 Data Soruc Namem 11 ="+dataSourceName+" loginId=:"+ loginId+"---- month=:"+ period);
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
...@@ -180,7 +180,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -180,7 +180,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
rowData.put("rep_nonrep", checkNull(rs.getString("REP_NONREP")).trim()); rowData.put("rep_nonrep", checkNull(rs.getString("REP_NONREP")).trim());
rowData.put("count", rs.getString("CNT")); rowData.put("count", rs.getString("CNT"));
rawDataComplianceDetailsDb2Json.put(count, rowData); rawDataComplianceHirarchyDB2Json.put(count, rowData);
count++; count++;
} }
} }
...@@ -212,15 +212,15 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -212,15 +212,15 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
throw new ITMException(d); throw new ITMException(d);
} }
} }
System.out.println("ComplianceEJB JSON String======>>"+rawDataComplianceDetailsDb2Json.toString()); System.out.println("ComplianceDB2 JSON String======>>"+rawDataComplianceHirarchyDB2Json.toString());
return rawDataComplianceDetailsDb2Json; return rawDataComplianceHirarchyDB2Json;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getComplianceCustDetailsDb2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException public JSONObject getComplianceSummaryDB2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException
{ {
JSONObject rawDataComplianceCustDetailsDb2Json = new JSONObject(); JSONObject rawDataComplianceSummaryDB2Json = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
String sql = ""; String sql = "";
ResultSet rs = null; ResultSet rs = null;
...@@ -229,11 +229,13 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -229,11 +229,13 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ComplianceEJB for getFrancoComplianceCustDetails Data Soruc Name ="+dataSourceName+" firstVal=:"+ firstVal + "===cellVal :"+ cellVal); System.out.println(" Inside ComplianceEJB for getComplianceSummaryDB2 Data Soruc Name ="+dataSourceName+" firstVal=:"+ firstVal + "===cellVal :"+ cellVal);
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
SimpleDateFormat gridDateFormat = new SimpleDateFormat( "dd-MMM-yy"); //SimpleDateFormat gridDateFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat("dd/MM/yy"); //SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat("dd/MM/yy");
SimpleDateFormat gridDateFormat = new SimpleDateFormat(genericUtility.getDBDateTimeFormat());
SimpleDateFormat convrtToTimStmDate= new SimpleDateFormat(genericUtility.getApplDateFormat());
if(cellVal!=null && cellVal.length()>0) if(cellVal!=null && cellVal.length()>0)
{ {
cellVal = gridDateFormat.format(convrtToTimStmDate.parse(cellVal)); cellVal = gridDateFormat.format(convrtToTimStmDate.parse(cellVal));
...@@ -245,7 +247,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -245,7 +247,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
sql = "SELECT SM.STRG_TYPE, (SC.FIRST_NAME ||' '||SC.MIDDLE_NAME ||' '||SC.LAST_NAME) AS CUST_NAME " + sql = "SELECT SM.STRG_TYPE, (SC.FIRST_NAME ||' '||SC.MIDDLE_NAME ||' '||SC.LAST_NAME) AS CUST_NAME " +
"FROM STRG_MEET SM INNER JOIN STRG_CUSTOMER SC ON SM.STRG_CODE = SC.SC_CODE " + "FROM STRG_MEET SM INNER JOIN STRG_CUSTOMER SC ON SM.STRG_CODE = SC.SC_CODE " +
"INNER JOIN VW_SALES_HIER_JJ VW ON SM.SALES_PERS = VW.REPCODE " + "INNER JOIN VW_SALES_HIER_JJ VW ON SM.SALES_PERS = VW.REPCODE " +
"WHERE SM.EVENT_DATE >= TIMESTAMP('"+cellVal+"','00:00:00') " + "WHERE SM.EVENT_DATE >= TIMESTAMP('"+cellVal.trim()+"') " +
"AND VW.REPNAME = '"+firstVal.trim()+"' "; "AND VW.REPNAME = '"+firstVal.trim()+"' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -256,7 +258,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -256,7 +258,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("customer_name", checkNull(rs.getString("CUST_NAME"))); rowData.put("customer_name", checkNull(rs.getString("CUST_NAME")));
rowData.put("strg_type", checkNull(rs.getString("STRG_TYPE"))); rowData.put("strg_type", checkNull(rs.getString("STRG_TYPE")));
rawDataComplianceCustDetailsDb2Json.put(count, rowData); rawDataComplianceSummaryDB2Json.put(count, rowData);
count++; count++;
} }
} }
...@@ -288,15 +290,15 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -288,15 +290,15 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
throw new ITMException(d); throw new ITMException(d);
} }
} }
System.out.println("ComplianceEJB rawDataComplianceCustDetailsDb2Json String======>>"+rawDataComplianceCustDetailsDb2Json.toString()); System.out.println("ComplianceEJB rawDataComplianceSummaryDB2Json String======>>"+rawDataComplianceSummaryDB2Json.toString());
return rawDataComplianceCustDetailsDb2Json; return rawDataComplianceSummaryDB2Json;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getComplianceGridDb2(String period, String personName, String dataSourceName) throws RemoteException, ITMException public JSONObject getComplianceDetailsDB2(String period, String personName, String dataSourceName) throws RemoteException, ITMException
{ {
JSONObject rawDataComplianceGridDb2Json = new JSONObject(); JSONObject rawDataComplianceDetailsDB2Json = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
String sql = ""; String sql = "";
ResultSet rs = null; ResultSet rs = null;
...@@ -305,7 +307,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -305,7 +307,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
try try
{ {
System.out.println(" Inside ComplianceEJB for getComplianceGridDb2 Data Soruc Name ="+dataSourceName+" period=:"+ period + "=== personName :"+ personName); System.out.println(" Inside ComplianceEJB for getComplianceDetailsDB2 Data Soruc Name ="+dataSourceName+" period=:"+ period + "=== personName :"+ personName);
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
...@@ -365,7 +367,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -365,7 +367,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
rowData.put("activity_code", rs.getString("ACTIVITY_CODE")); rowData.put("activity_code", rs.getString("ACTIVITY_CODE"));
} }
rawDataComplianceGridDb2Json.put(count, rowData); rawDataComplianceDetailsDB2Json.put(count, rowData);
count++; count++;
} }
} }
...@@ -393,11 +395,11 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C ...@@ -393,11 +395,11 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
} catch (Exception d) } catch (Exception d)
{ {
d.printStackTrace(); d.printStackTrace();
System.out.println("Exception in :ComplianceDB2: getComplianceGridDb2 " + d.getMessage()); System.out.println("Exception in :ComplianceDB2: getComplianceDetailsDB2 " + d.getMessage());
throw new ITMException(d); throw new ITMException(d);
} }
} }
return rawDataComplianceGridDb2Json; return rawDataComplianceDetailsDB2Json;
} }
/*End Below 3 methods for Franco Compliance Report by Nikhil /*End Below 3 methods for Franco Compliance Report by Nikhil
......
webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2Local.java
View file @ 40386226
...@@ -10,7 +10,7 @@ import org.json.simple.JSONObject; ...@@ -10,7 +10,7 @@ import org.json.simple.JSONObject;
@Local @Local
public interface ComplianceDB2Local extends ValidatorLocal public interface ComplianceDB2Local extends ValidatorLocal
{ {
public JSONObject getComplianceDetailsDb2(String loginId, String dataSourceName,String month) throws RemoteException, ITMException; public JSONObject getComplianceHirarchyDB2(String loginId, String dataSourceName,String month) throws RemoteException, ITMException;
public JSONObject getComplianceCustDetailsDb2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException; public JSONObject getComplianceSummaryDB2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException;
public JSONObject getComplianceGridDb2(String month, String personName, String dataSourceName) throws RemoteException, ITMException; public JSONObject getComplianceDetailsDB2(String month, String personName, String dataSourceName) throws RemoteException, ITMException;
} }
webitm-dashboard/ibase/dashboard/sfa/ejb/ComplianceDB2Remote.java
View file @ 40386226
...@@ -9,7 +9,7 @@ import org.json.simple.JSONObject; ...@@ -9,7 +9,7 @@ import org.json.simple.JSONObject;
@Remote @Remote
public interface ComplianceDB2Remote extends ValidatorRemote public interface ComplianceDB2Remote extends ValidatorRemote
{ {
public JSONObject getComplianceDetailsDb2(String loginId, String dataSourceName,String month) throws RemoteException, ITMException; public JSONObject getComplianceHirarchyDB2(String loginId, String dataSourceName,String month) throws RemoteException, ITMException;
public JSONObject getComplianceCustDetailsDb2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException; public JSONObject getComplianceSummaryDB2(String firstVal, String cellVal, String dataSourceName) throws RemoteException, ITMException;
public JSONObject getComplianceGridDb2(String month, String personName, String dataSourceName) throws RemoteException, ITMException; public JSONObject getComplianceDetailsDB2(String month, String personName, String dataSourceName) throws RemoteException, ITMException;
} }
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