assessment dashboard changes

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200801 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/sfa/ejb/AssessMentEJB.java

@@ -78,15 +78,18 @@ public class AssessMentEJB extends ValidatorEJB implements AssessMentEJBLocal,As
 				System.out.println("team args "+teamArgs);
 			}
 			//Added by PriyankaB for serdia Client 5-10-2018(end)
-			String symbol="";
+			String symbol="",submitDate="";
 			if("MSSQL".equalsIgnoreCase(CommonConstants.DB_NAME))
 			{
 				symbol="+' '+";
-				
+				submitDate ="CAST(R.SUBMIT_DATE AS DATE) ";
+
 			}
 			else
 			{
 				symbol="||' '||";
+				submitDate ="TRUNC(R.SUBMIT_DATE) ";
+
 			}
 			
 		    String regionalUsrImg="",AssessorusrImg="",AssessusrImg="";
@@ -157,7 +160,7 @@ public class AssessMentEJB extends ValidatorEJB implements AssessMentEJBLocal,As
 					"AND rp.entity_code      IN "+getFormattedUserId(teamArgs)+" "+
 					"AND f.survey_id         = '"+surveyId+"' " +
 					"AND m.result_type!='T' "+
-					"AND r.submit_date BETWEEN ? AND ? ";
+					"AND "+submitDate+" BETWEEN ? AND ? ";
 			
 			mStatement = mConnection.prepareStatement(query);
 			mStatement.setDate(1, java.sql.Date.valueOf(fromDate) );
@@ -189,7 +192,8 @@ public class AssessMentEJB extends ValidatorEJB implements AssessMentEJBLocal,As
 			      rowDataVar.put("ASSESSEE_ICON", AssessusrImg);
 			      rowDataVar.put("SURVEY_CODE_DESCR", E12GenericUtility.checkNull(mResultSet.getString("survey_code_descr")));
 			      rowDataVar.put("RESULT_RANGE_MAX", E12GenericUtility.checkNull(mResultSet.getString("result_range_max")));
-			      rowDataVar.put("SUBMIT_DATE",  e12genericUtil.getValidDateString( E12GenericUtility.checkNull(mResultSet.getDate("submit_date").toString()), e12genericUtil.getDBDateFormat(), e12genericUtil.getApplDateFormat()) );
+			      System.out.println("SubmitDate::::::::::::"+mResultSet.getString("submit_date"));
+			      rowDataVar.put("SUBMIT_DATE",  e12genericUtil.getValidDateString( E12GenericUtility.checkNull(mResultSet.getString("submit_date").toString()), e12genericUtil.getDBDateTimeFormat(), e12genericUtil.getApplDateTimeFormat()) );
 			      rowDataVar.put("TRAN_ID", E12GenericUtility.checkNull(mResultSet.getString("tran_id")));
 			      rowDataVar.put("SUBMIT_DATE_MAX_TOTAL", E12GenericUtility.checkNull(mResultSet.getString("result_range_max_total")));
 			      rowDataVar.put("RESULT", E12GenericUtility.checkNull(mResultSet.getString("result")));