Skip to content

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

Sql and java code changes in ProductAssessment.java 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101489 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 986dc066
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 111 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/ProductAssessment.java
View file @ f356781d
...@@ -42,8 +42,6 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -42,8 +42,6 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
DashboardUtility dashbordUtil = new DashboardUtility(); DashboardUtility dashbordUtil = new DashboardUtility();
try try
{ {
//System.out.println(" Inside ProductAssessment for getProductAssessmentEventServlet Data Soruc Name ="+dataSourceName+" loginId=:"+ loginId);
//System.out.println("zone :"+zone+"==== region :"+region+ "===== product :"+product+"=== team :"+team);
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
...@@ -95,28 +93,18 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -95,28 +93,18 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
} }
/*sql= "select e.ZONECODE ZONE, r.Name as REGION, e.teamcode TEAM, " +
"(e.FIRSTNAME +' '+ e.LASTNAME) NAME ,COUNT(SUR.MGR) NOS, " +
"SUM(SUR.RESULT) TOTAL from dbo.employee e INNER JOIN HR.DBO.REGION r on e.regionid = r.id INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " +
"SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " +
"APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC FROM dbo.survey_result_EMP SRE INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'P') APPR ON SRD.TRAN_ID = APPR.TRAN_ID WHERE APPR.ENTITY_CODE = "+product+" GROUP BY APP.ENTITY_CODE, " +
"SRE.EMP_CODE, APPR.ENTITY_CODE, " +
"APPR.ENTITY_DESCR) SUR ON e.code = SUR.EMP_CODE WHERE e.ZONECODE = "+zone+" AND r.Name = "+region+" AND e.teamcode = "+team+" GROUP BY e.ZONECODE, " +
"r.Name, e.teamcode, (e.FIRSTNAME +' '+ e.LASTNAME)";
*/
/*working SQL on dated 04-11-2015*/ /*working SQL on dated 04-11-2015*/
sql= "select e.ZONECODE ZONE, r.Name as REGION, e.teamcode TEAM, " + sql= "select e.ZONECODE ZONE, r.Name as REGION, e.teamcode TEAM, " +
"(e.FIRSTNAME +' '+ e.LASTNAME) NAME ,COUNT(SUR.MGR) NOS, " + "(e.FIRSTNAME +' '+ e.LASTNAME) NAME ,COUNT(SUR.MGR) NOS, " +
"SUM(SUR.RESULT) TOTAL from dbo.employee e " + "SUM(SUR.RESULT) TOTAL from hr.dbo.employee e " +
"INNER JOIN DBO.REGION r on e.regionid = r.id " + "INNER JOIN hr.dbo.REGION r on e.regionid = r.id " +
"INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " + "INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " +
"SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " + "SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " +
"APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC " + "APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC " +
"FROM dbo.survey_result_EMP SRE INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "FROM hr.dbo.survey_result_EMP SRE INNER JOIN hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " + "INNER JOIN hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'I') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'I') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
" "+productFilter+" GROUP BY APP.ENTITY_CODE, " + " "+productFilter+" GROUP BY APP.ENTITY_CODE, " +
"SRE.EMP_CODE, APPR.ENTITY_CODE, " + "SRE.EMP_CODE, APPR.ENTITY_CODE, " +
"APPR.ENTITY_DESCR) SUR ON e.code = SUR.EMP_CODE " + "APPR.ENTITY_DESCR) SUR ON e.code = SUR.EMP_CODE " +
...@@ -127,12 +115,12 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -127,12 +115,12 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
/* sql for Testing on dated 06-11-2015*/ /* sql for Testing on dated 06-11-2015*/
/*sql = "select e.ZONECODE ZONE, r.Name as REGION, e.teamcode TEAM, " + /*sql_base = "select e.ZONECODE ZONE, r.Name as REGION, e.teamcode TEAM, " +
"(e.FIRSTNAME +' '+ e.LASTNAME) NAME ,COUNT(SUR.MGR) NOS, " + "(e.FIRSTNAME +' '+ e.LASTNAME) NAME ,COUNT(SUR.MGR) NOS, " +
"SUM(SUR.RESULT) TOTAL from dbo.employee e INNER JOIN HR.DBO.REGION r on e.regionid = r.id INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " + "SUM(SUR.RESULT) TOTAL from hr.hr.dbo.employee e INNER JOIN HR.hr.hr.dbo.REGION r on e.regionid = r.id INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " +
"SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " + "SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " +
"APPR.ENTITY_CODE PRD_CODE, " + "APPR.ENTITY_CODE PRD_CODE, " +
"APPR.ENTITY_DESCR PRD_DESC FROM dbo.survey_result_EMP SRE INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "APPR.ENTITY_DESCR PRD_DESC FROM hr.hr.dbo.survey_result_EMP SRE INNER JOIN hr.hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM INNER JOIN hr.hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM hr.hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID INNER JOIN (SELECT * FROM hr.hr.dbo.survey_result_appl " +
//"WHERE APPL_ENTITY = 'I' " + //"WHERE APPL_ENTITY = 'I' " +
")APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + ")APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
//"and SRD.TRAN_ID IN ('ES00002043','ES00002044','ES00002045') " + //"and SRD.TRAN_ID IN ('ES00002043','ES00002044','ES00002045') " +
...@@ -152,11 +140,6 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -152,11 +140,6 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
rowData.put("name", checkNull(rs.getString("NAME"))); rowData.put("name", checkNull(rs.getString("NAME")));
rowData.put("nos",checkNull( rs.getString("NOS"))); rowData.put("nos",checkNull( rs.getString("NOS")));
rowData.put("total",checkNull( rs.getString("TOTAL"))); rowData.put("total",checkNull( rs.getString("TOTAL")));
//rowData.put("%", rs.getString("%"));
//rowData.put("detail", rs.getString("DETAIL"));
rawDataEmployeeProdSurveylJson.put(count, rowData); rawDataEmployeeProdSurveylJson.put(count, rowData);
count++; count++;
} }
...@@ -210,98 +193,67 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -210,98 +193,67 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
/*sql from sarvesh*/ /*sql_base = "select MGR, NAME, SURVEY, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " +
/*sql="SELECT (e.FIRSTNAME +' '+ e.LASTNAME) NAME, sm.descr as SURVEY , " +
"CAST(SRD.result AS INT) RESULT FROM dbo.survey_result_EMP SRE " +
"INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'P') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " +
"WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = 'EMP_NAME' AND APPR.ENTITY_DESCR IN ('PRD_DESC')";
*/
/*sql for testing*/
/*sql="select NAME, SURVEY, RESULT from ( SELECT (e.FIRSTNAME +' '+ e.LASTNAME) as NAME, " +
"sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT FROM dbo.survey_result_EMP SRE " +
"INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'P') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE ) A " +
"WHERE NAME = 'Amrapali A. Nimbalkar' " +
"AND SURVEY IN ('Opening','Detailing','Probing','Listening')";
*/
//" WHERE SRD.SURVEY_CODE LIKE 'P%' " +
//" WHERE SRD.SURVEY_CODE LIKE 'P%' " +
/*sql = "select MGR, NAME, SURVEY, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " +
"(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " + "(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " +
"FROM dbo.survey_result_EMP SRE INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "FROM hr.hr.dbo.survey_result_EMP SRE INNER JOIN hr.hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " + "INNER JOIN hr.hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
//"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + //"INNER JOIN (SELECT * FROM hr.hr.dbo.survey_result_appl " +
//"WHERE APPL_ENTITY = 'P') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + //"WHERE APPL_ENTITY = 'P') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " + "INNER JOIN hr.hr.dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " + "INNER JOIN hr.hr.dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " +
"LEFT OUTER JOIN dbo.employee e1 ON SRE.EMP_CODE = e1.code) A " + "LEFT OUTER JOIN hr.hr.dbo.employee e1 ON SRE.EMP_CODE = e1.code) A " +
"WHERE NAME = 'Prasad Kadam' " + "WHERE NAME = 'Prasad Kadam' " +
"AND SURVEY IN ('Opening','Detailing','Probing','Listening') " + "AND SURVEY IN ('Opening','Detailing','Probing','Listening') " +
"GROUP BY MGR, NAME, SURVEY"; "GROUP BY MGR, NAME, SURVEY";
*/ */
/*wORKING SQL*/ /*wORKING SQL*/
sql = "SELECT NAME, PRD_NAME, PERC, REPORT,RESULTCNT FROM (SELECT DET_PRD.NAME , DET_PRD.PRD_NAME,RESULT,TOTAL, " + sql = "SELECT NAME, PRD_NAME, PERC, REPORT,RESULTCNT,TOTAL FROM (SELECT DET_PRD.NAME , DET_PRD.PRD_NAME,RESULT,TOTAL, " +
"Str((RESULT * 100.0/TOTAL),4,1) AS PERC, 'Obtained Marks' AS REPORT,(RESULT) as RESULTCNT " + "Str((RESULT * 100.0/TOTAL),4,1) AS PERC, 'Marks' AS REPORT,(RESULT) as RESULTCNT " +
"FROM ( select e.CODE, SUM(SUR.RESULT) TOTAL from dbo.employee e " + "FROM ( select e.CODE, SUM(SUR.RESULT) TOTAL from hr.dbo.employee e " +
"INNER JOIN DBO.REGION r on e.regionid = r.id " + "INNER JOIN hr.dbo.REGION r on e.regionid = r.id " +
"INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " + "INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, " +
"APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC FROM dbo.survey_result_EMP SRE " + "APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC FROM hr.dbo.survey_result_EMP SRE " +
"INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "INNER JOIN hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " + "INNER JOIN hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl " +
" WHERE APPL_ENTITY = 'I'" + " WHERE APPL_ENTITY = 'I'" +
") APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + ") APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"GROUP BY APP.ENTITY_CODE, SRE.EMP_CODE, APPR.ENTITY_CODE, APPR.ENTITY_DESCR) " + "GROUP BY APP.ENTITY_CODE, SRE.EMP_CODE, APPR.ENTITY_CODE, APPR.ENTITY_DESCR) " +
"SUR ON e.code = SUR.EMP_CODE " + "SUR ON e.code = SUR.EMP_CODE " +
"WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' GROUP BY e.CODE ) HDR " + "WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' GROUP BY e.CODE ) HDR " +
"INNER JOIN (SELECT (e.FIRSTNAME +' '+ e.LASTNAME) NAME, APPR.ENTITY_DESCR as PRD_NAME , " + "INNER JOIN (SELECT (e.FIRSTNAME +' '+ e.LASTNAME) NAME, APPR.ENTITY_DESCR as PRD_NAME , " +
"SUM(CAST(SRD.result AS INT)) RESULT , e.code FROM dbo.survey_result_EMP SRE " + "SUM(CAST(SRD.result AS INT)) RESULT , e.code FROM hr.dbo.survey_result_EMP SRE " +
"INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "INNER JOIN hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " + "INNER JOIN hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'E') " +
"APP ON SRD.TRAN_ID = APP.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "APP ON SRD.TRAN_ID = APP.TRAN_ID INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl " +
" WHERE APPL_ENTITY = 'I'" + " WHERE APPL_ENTITY = 'I'" +
") APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + ") APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " + "INNER JOIN hr.dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " + "INNER JOIN hr.dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " +
"WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' " + "WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' " +
"GROUP BY (e.FIRSTNAME +' '+ e.LASTNAME) , APPR.ENTITY_DESCR , e.code) DET_PRD ON HDR.CODE = DET_PRD.CODE " + "GROUP BY (e.FIRSTNAME +' '+ e.LASTNAME) , APPR.ENTITY_DESCR , e.code) DET_PRD ON HDR.CODE = DET_PRD.CODE " +
"UNION ALL " + "UNION ALL " +
"SELECT DET_PRD.NAME , DET_PRD.PRD_NAME,RESULT,TOTAL, Str((100-(RESULT * 100.0/TOTAL)),4,1) PERC, 'NR' AS REPORT,(TOTAL - RESULT) as RESULTCNT " + "SELECT DET_PRD.NAME , DET_PRD.PRD_NAME,RESULT,TOTAL, Str((100-(RESULT * 100.0/TOTAL)),4,1) PERC, 'Remaining' AS REPORT,(TOTAL - RESULT) as RESULTCNT " +
"FROM ( select e.CODE, SUM(SUR.RESULT) TOTAL from dbo.employee e INNER JOIN DBO.REGION r on e.regionid = r.id INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " + "FROM ( select e.CODE, SUM(SUR.RESULT) TOTAL from hr.dbo.employee e INNER JOIN hr.dbo.REGION r on e.regionid = r.id INNER JOIN (SELECT APP.ENTITY_CODE EMP_CODE, " +
"SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC FROM dbo.survey_result_EMP SRE " + "SRE.EMP_CODE MGR, sum(CAST(SRD.result AS INT)) RESULT, APPR.ENTITY_CODE PRD_CODE, APPR.ENTITY_DESCR PRD_DESC FROM hr.dbo.survey_result_EMP SRE " +
"INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "INNER JOIN hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "INNER JOIN hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'I'" + "WHERE APPL_ENTITY = 'I'" +
") APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + ") APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"GROUP BY APP.ENTITY_CODE, SRE.EMP_CODE, APPR.ENTITY_CODE, APPR.ENTITY_DESCR) SUR ON e.code = SUR.EMP_CODE " + "GROUP BY APP.ENTITY_CODE, SRE.EMP_CODE, APPR.ENTITY_CODE, APPR.ENTITY_DESCR) SUR ON e.code = SUR.EMP_CODE " +
"WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' GROUP BY e.CODE ) HDR INNER JOIN (SELECT (e.FIRSTNAME +' '+ e.LASTNAME) NAME, APPR.ENTITY_DESCR as PRD_NAME , " + "WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' GROUP BY e.CODE ) HDR INNER JOIN (SELECT (e.FIRSTNAME +' '+ e.LASTNAME) NAME, APPR.ENTITY_DESCR as PRD_NAME , " +
"SUM(CAST(SRD.result AS INT)) RESULT , e.code FROM dbo.survey_result_EMP SRE INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "SUM(CAST(SRD.result AS INT)) RESULT , e.code FROM hr.dbo.survey_result_EMP SRE INNER JOIN hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "INNER JOIN hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'I'" + "WHERE APPL_ENTITY = 'I'" +
") APPR ON SRD.TRAN_ID = APPR.TRAN_ID INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " + ") APPR ON SRD.TRAN_ID = APPR.TRAN_ID INNER JOIN hr.dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " + "INNER JOIN hr.dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " +
"WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' GROUP BY (e.FIRSTNAME +' '+ e.LASTNAME) , APPR.ENTITY_DESCR , e.code) DET_PRD ON HDR.CODE = DET_PRD.CODE) X " + "WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' GROUP BY (e.FIRSTNAME +' '+ e.LASTNAME) , APPR.ENTITY_DESCR , e.code) DET_PRD ON HDR.CODE = DET_PRD.CODE) X " +
"ORDER BY NAME, PRD_NAME"; "ORDER BY NAME, PRD_NAME";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -313,8 +265,9 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -313,8 +265,9 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
rowData.put("prd_name", checkNull(rs.getString("PRD_NAME"))); rowData.put("prd_name", checkNull(rs.getString("PRD_NAME")));
rowData.put("name", checkNull(rs.getString("NAME"))); rowData.put("name", checkNull(rs.getString("NAME")));
rowData.put("perc", checkNull(rs.getString("PERC"))); rowData.put("perc", checkNull(rs.getString("PERC")));
rowData.put("report", checkNull(rs.getString("REPORT"))); rowData.put("report", checkNull(rs.getString("REPORT"))+" out of "+checkNull( rs.getString("TOTAL")));
rowData.put("resultcnt", checkNull(rs.getString("RESULTCNT"))); rowData.put("resultcnt", checkNull(rs.getString("RESULTCNT")));
rowData.put("tooltext",checkNull( rs.getString("TOTAL")));
rawDataEmployeeProductlJson.put(count, rowData); rawDataEmployeeProductlJson.put(count, rowData);
count++; count++;
} }
...@@ -370,29 +323,29 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment ...@@ -370,29 +323,29 @@ public class ProductAssessment extends ValidatorEJB implements ProductAssessment
/*sql= "select MGR, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " + /*sql= "select MGR, SUM(RESULT) RESULT from ( SELECT (e1.FIRSTNAME +' '+ e1.LASTNAME) as MGR, " +
"(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " + "(e.FIRSTNAME +' '+ e.LASTNAME) as NAME, sm.descr as SURVEY, CAST(SRD.result AS INT) RESULT " +
"FROM dbo.survey_result_EMP SRE INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "FROM hr.hr.dbo.survey_result_EMP SRE INNER JOIN hr.hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " + "INNER JOIN hr.hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'I') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + "WHERE APPL_ENTITY = 'I') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " + "INNER JOIN hr.hr.dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " + "INNER JOIN hr.hr.dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " +
"LEFT OUTER JOIN dbo.employee e1 ON SRE.EMP_CODE = e1.code) A " + "LEFT OUTER JOIN hr.hr.dbo.employee e1 ON SRE.EMP_CODE = e1.code) A " +
"WHERE NAME = 'Prasad Kadam' " + "WHERE NAME = 'Prasad Kadam' " +
"AND SURVEY IN ('Opening','Detailing','Probing','Listening') " + "AND SURVEY IN ('Opening','Detailing','Probing','Listening') " +
"GROUP BY MGR ";*/ "GROUP BY MGR ";*/
/*wORKING SQL*/ /*wORKING SQL*/
sql = "SELECT sm.DESCR as SURVEY , SUM(CAST(SRD.result AS INT)) RESULT FROM dbo.survey_result_EMP SRE " + sql = "SELECT sm.DESCR as SURVEY , SUM(CAST(SRD.result AS INT)) RESULT FROM hr.dbo.survey_result_EMP SRE " +
"INNER JOIN dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " + "INNER JOIN hr.dbo.survey_result SR ON SRE.TRAN_ID = SR.TRAN_ID__FORM " +
"INNER JOIN dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " + "INNER JOIN hr.dbo.survey_result_det SRD ON SR.TRAN_ID = SRD.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " + "WHERE APPL_ENTITY = 'E') APP ON SRD.TRAN_ID = APP.TRAN_ID " +
"INNER JOIN (SELECT * FROM dbo.survey_result_appl " + "INNER JOIN (SELECT * FROM hr.dbo.survey_result_appl " +
"WHERE APPL_ENTITY = 'I') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " + "WHERE APPL_ENTITY = 'I') APPR ON SRD.TRAN_ID = APPR.TRAN_ID " +
"INNER JOIN dbo.employee e ON APP.ENTITY_CODE = e.code " + "INNER JOIN hr.dbo.employee e ON APP.ENTITY_CODE = e.code " +
"INNER JOIN dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " + "INNER JOIN hr.dbo.survey_master sm ON SRD.SURVEY_CODE = sm.SURVEY_CODE " +
"WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' and APPR.ENTITY_DESCR = '"+productName+"' " + "WHERE (e.FIRSTNAME +' '+ e.LASTNAME) = '"+personName+"' and APPR.ENTITY_DESCR = '"+productName+"' " +
"GROUP BY sm.DESCR"; "GROUP BY sm.DESCR";
......
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