Updated changes for sprs cust info

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

webitm-dashboard/ibase/dashboard/common/bean/SprsCustInfo.java

@@ -84,21 +84,51 @@ public class SprsCustInfo extends ValidatorEJB
 					// changes made by rupali on 19/10/19 for getting data from sprs_stockist also [end]
 					else
 					{
-						sqlCurrYear.append("SELECT SC.SC_CODE AS strg_code " )
-						.append("FROM STRG_CUSTOMER SC, ") 
-						.append("STRG_SERIES SS " )
-						.append("WHERE SS.SC_CODE=SC.SC_CODE " ) 
-						.append("AND SS.SALES_PERS= '"+empCode+"' " )
-						.append("AND SS.SC_CODE IN " )
-						.append("(SELECT SC_CODE " )
-						.append("FROM STRG_STATUS_HIST " ) 
-						.append("WHERE STATUS='Y' " ) 
-						.append("AND SALES_PERS=SS.SALES_PERS " )
-						.append("AND SC_CODE=SC.SC_CODE AND SYSDATE BETWEEN EFF_DATE AND VALID_UPTO) " ) 
-						.append("AND SS.STATUS='Y'");
+						sqlCurrYear.append(" SELECT sc.sc_code, ")
+						.append("   sc.prefix, ")
+						.append("   sc.first_name ")
+						.append("   ||' ' ")
+						.append("   || sc.last_name AS sc_name, ")
+						.append("   sc.qualification, ")
+						.append("   sc.class_code, ")
+						.append("   (SELECT class_code_descr ")
+						.append("   FROM strg_cust_class scc ")
+						.append("   WHERE scc.class_code = sc.class_code ")
+						.append("   AND scc.cust_type    = sc.cust_type ")
+						.append("   )        AS class_code_descr, ")
+						.append("   sc.addr1 AS addr1, ")
+						.append("   sc.addr2 addr2, ")
+						.append("   sc.addr3 addr3, ")
+						.append("   sc.mobile_no, ")
+						.append("   sc.email_addr, ")
+						.append("   (SELECT LISTAGG(s.descr, ', ') WITHIN GROUP ( ")
+						.append("   ORDER BY s.spl_code DESC) ")
+						.append("   FROM speciality s, ")
+						.append("     strg_series ss ")
+						.append("   WHERE ss.spl_code = s.spl_code ")
+						.append("   AND ss.sc_code    = sc.sc_code ")
+						.append("   AND ss.sales_pers = '"+ empCode +"' ")
+						.append("   ) AS speciality_descr ")
+						.append(" FROM strg_customer sc ")
+						.append(" UNION ")
+						.append(" SELECT cust.cust_code, ")
+						.append("   ''             AS prefix, ")
+						.append("   cust.cust_name AS sc_name, ")
+						.append("   ''             AS qualification, ")
+						.append("   ''             AS class_code, ")
+						.append("   ''             AS class_code_descr, ")
+						.append("   cust.addr1     AS addr1, ")
+						.append("   cust.addr2 addr2, ")
+						.append("   cust.addr3 addr3, ")
+						.append("   '' AS mobile_no, ")
+						.append("   cust.email_addr, ")
+						.append("   '' AS speciality_descr ")
+						.append(" FROM customer cust ");
 						
 					}
 					
+					long startTime = System.nanoTime();
+					System.out.println("start time "+startTime);
 					System.out.println("SQL QUERY EXECUTED ::::::::::::::::: " + sqlCurrYear );
 					
 					pStmt = conn.prepareStatement( sqlCurrYear.toString() );
@@ -113,10 +143,38 @@ public class SprsCustInfo extends ValidatorEJB
 					int count=0;
 					while(rs.next())
 					{
-						String strgCode=rs.getString("STRG_CODE");
+					//	String strgCode=rs.getString("STRG_CODE");
+						
+						String strgCode = rs.getString("SC_CODE");
+						String prefix = rs.getString("PREFIX");
+						String sc_name = rs.getString("SC_NAME");
+						String qualification = rs.getString("QUALIFICATION");
+						String class_code = rs.getString("CLASS_CODE");
+						String class_code_descr = rs.getString("CLASS_CODE_DESCR");
+						String addr1 = rs.getString("ADDR1");
+						String addr2 = rs.getString("ADDR2");
+						String addr3 = rs.getString("ADDR3");
+						String mobile_no = rs.getString("MOBILE_NO");
+						String email_addr = rs.getString("EMAIL_ADDR");
+						String spec_descr = rs.getString("SPECIALITY_DESCR");
+						
+						
 						System.out.println("strg code "+strgCode);
-						customerInfoObj = customerInfoDao.getCustInfoData(strgCode);
-						System.out.println("customerInfoObj :::::: "+customerInfoObj);
+						//customerInfoObj = customerInfoDao.getCustInfoData(strgCode);
+						
+						customerInfoObj.put("SC_CODE", checkNull(strgCode,""));
+						customerInfoObj.put("PREFIX", checkNull(prefix,""));
+						customerInfoObj.put("SC_NAME", checkNull(sc_name,"NA"));
+						customerInfoObj.put("QUALIFICATION", checkNull(qualification,"NA"));
+						customerInfoObj.put("CLASS_CODE", checkNull(class_code,"NA"));
+						customerInfoObj.put("CLASS_CODE_DESCR", checkNull(class_code_descr,""));
+						customerInfoObj.put("ADDR1", checkNull(addr1,""));
+						customerInfoObj.put("ADDR2", checkNull(addr2,""));
+						customerInfoObj.put("ADDR3", checkNull(addr3,""));
+						customerInfoObj.put("MOBILE_NO", checkNull(mobile_no,""));
+						customerInfoObj.put("EMAIL_ADDR", checkNull(email_addr,"NA"));
+						customerInfoObj.put("SPECIALITY_DESCR", checkNull(spec_descr,""));
+						System.out.println("customerInfoObj >>>>> "+customerInfoObj);
 						
 						JSONArray custHistArr = new JSONArray();
 						
@@ -134,6 +192,11 @@ public class SprsCustInfo extends ValidatorEJB
 					}
 					System.out.println("count ::::: "+count);
 					finalCustomerInfoJson.put("status", "Success" );
+					long endTime = System.nanoTime();
+					
+					System.out.println("end time "+endTime);
+					
+					System.out.println("total time "+(endTime - startTime));
 					pStmt.close();
 					pStmt = null;					
 					rs.close();
@@ -450,4 +513,12 @@ public class SprsCustInfo extends ValidatorEJB
 		}
 		return paramValue;
 	}
+	public String checkNull(String input,String alternateValue)
+	{
+		if (input == null || "null".equalsIgnoreCase(input))
+		{
+			input= alternateValue;
+		}
+		return input.trim();
+	}
 }

webitm-dashboard/ibase/dashboard/common/hibernate/dao/CustomerInfoDao.java

@@ -80,7 +80,7 @@ public class CustomerInfoDao {
 					" FROM customer cust WHERE cust.cust_code = '"+strgCode+"' ";
 			// changes made by rupali on 19/10/19 for getting data from sprs_stockist also [end]
 			
-			System.out.println("custInfoSql+++"+custInfoSql);
+			System.out.println("getCustInfoData custInfoSql+++"+custInfoSql);
 			pstmt = conn.prepareStatement(custInfoSql);
 			rs = pstmt.executeQuery();
 						
@@ -210,7 +210,7 @@ public class CustomerInfoDao {
 			.append(" and sm.event_date between TO_DATE('"+fromDate+"','YYYY-MM-dd') and TO_DATE('"+toDate+"','YYYY-MM-dd')")
 			.append(" order by sm.event_date desc");
 
-			System.out.println("custInfoSql+++"+custCallHistSql);
+			System.out.println("getCustomerCallHistory custInfoSql+++"+custCallHistSql);
 			pstmt = conn.prepareStatement(custCallHistSql.toString());
 			rs = pstmt.executeQuery();
 						
@@ -314,7 +314,7 @@ public class CustomerInfoDao {
 					" WHERE ROWNUM < 11"
 					+ ") WHERE BRAND_CODE IS NOT NULL AND DESCR IS NOT NULL";
 
-			System.out.println("getTopBrands+++"+custCallHistSql);
+			System.out.println("getTopBrands getTopBrands+++"+custCallHistSql);
 			pstmt = conn.prepareStatement(custCallHistSql);
 			rs = pstmt.executeQuery();
 			while(rs.next())
@@ -432,7 +432,7 @@ public class CustomerInfoDao {
 					//Changes by Prajyot on 17OCT2019 - Added SALES PERSON in condition
 					" and sm.sales_pers = '" + empCode + "'";
 
-			System.out.println("custOrdersSql+++"+custOrdersSql);
+			System.out.println("getCustomerOrders custOrdersSql+++"+custOrdersSql);
 			pstmt = conn.prepareStatement(custOrdersSql);
 			rs = pstmt.executeQuery();
 						
@@ -524,7 +524,7 @@ public class CustomerInfoDao {
 					//Changes by Prajyot on 17OCT2019 - Added SALES PERSON in condition
 					" and sm.sales_pers = '" + empCode + "'";
 
-			System.out.println("dispDetailSql+++"+dispDetailSql);
+			System.out.println("getDisplayDetails dispDetailSql+++"+dispDetailSql);
 			pstmt = conn.prepareStatement(dispDetailSql);
 			rs = pstmt.executeQuery();
 						
@@ -619,7 +619,7 @@ public class CustomerInfoDao {
 					+ " and sm.sales_pers = '" + empCode + "'"
 					+ " order by sbp.PITCH_SEQUENCE";
 
-			System.out.println("brandDetailSql+++"+brandDetailSql);
+			System.out.println("getBrandDetails brandDetailSql+++"+brandDetailSql);
 			pstmt = conn.prepareStatement(brandDetailSql);
 			rs = pstmt.executeQuery();
 						
@@ -695,7 +695,7 @@ public class CustomerInfoDao {
 			docInfoSql = "select doc_id, file_type_attach from DOC_TRANSACTION_LINK " +
 						 "where ref_id = '"+refId+"'";
 
-			System.out.println("docInfoSql+++"+docInfoSql);
+			System.out.println("getDocumentDetail docInfoSql+++"+docInfoSql);
 			pstmt = conn.prepareStatement(docInfoSql);
 			rs = pstmt.executeQuery();
 						
@@ -842,7 +842,7 @@ public class CustomerInfoDao {
 			.append(" order by sm.event_date desc )")
 			.append(" where Rownum <= "+callsCount);
 
-			System.out.println("custInfoSql+++"+custCallHistSql);
+			System.out.println("getCustomerLastCallHistory custInfoSql+++"+custCallHistSql);
 			pstmt = conn.prepareStatement(custCallHistSql.toString());
 			rs = pstmt.executeQuery();