Commit 388c340e authored by sdhaul's avatar sdhaul

Added TRAN_ID column in Todays Dashboard


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@197937 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6f930deb
...@@ -2202,6 +2202,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -2202,6 +2202,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorarryObj.put("LISTED", doctorObject.optString("LISTED")); doctorarryObj.put("LISTED", doctorObject.optString("LISTED"));
doctorarryObj.put("CUST_CODE", doctorObject.optString("CUST_CODE")); doctorarryObj.put("CUST_CODE", doctorObject.optString("CUST_CODE"));
doctorarryObj.put("STATUS", doctorObject.optString("STATUS")); doctorarryObj.put("STATUS", doctorObject.optString("STATUS"));
doctorarryObj.put("TRAN_ID", doctorObject.optString("TRAN_ID"));
existingDocArray.put(doctorarryObj); existingDocArray.put(doctorarryObj);
doctorFinalArray.getJSONObject(j).put("CUSTOMERS", existingDocArray); doctorFinalArray.getJSONObject(j).put("CUSTOMERS", existingDocArray);
...@@ -2224,6 +2225,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -2224,6 +2225,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorarryObj.put("LISTED", doctorObject.optString("LISTED")); doctorarryObj.put("LISTED", doctorObject.optString("LISTED"));
doctorarryObj.put("CUST_CODE", doctorObject.optString("CUST_CODE")); doctorarryObj.put("CUST_CODE", doctorObject.optString("CUST_CODE"));
doctorarryObj.put("STATUS", doctorObject.optString("STATUS")); doctorarryObj.put("STATUS", doctorObject.optString("STATUS"));
doctorarryObj.put("TRAN_ID", doctorObject.optString("TRAN_ID"));
newDocArray.put(doctorarryObj); newDocArray.put(doctorarryObj);
doctorObjectNew.put("CUSTOMERS", newDocArray); doctorObjectNew.put("CUSTOMERS", newDocArray);
...@@ -2611,6 +2613,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -2611,6 +2613,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
//Updated by Priyanka B on 9/01/19 start //Updated by Priyanka B on 9/01/19 start
sql="SELECT SM.STRG_CODE AS SC_CODE, " + sql="SELECT SM.STRG_CODE AS SC_CODE, " +
" SM.STRG_NAME AS STRG_NAME," + " SM.STRG_NAME AS STRG_NAME," +
" SM.TRAN_ID AS TRAN_ID," +
" LOC.DESCR AS Locality, " + " LOC.DESCR AS Locality, " +
" SCT.SH_DESCR, " + " SCT.SH_DESCR, " +
" 'UNPLANNED' AS STATUS, " + " 'UNPLANNED' AS STATUS, " +
...@@ -2654,6 +2657,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -2654,6 +2657,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
"UNION ALL " + "UNION ALL " +
"SELECT SM.STRG_CODE AS SC_CODE, " + "SELECT SM.STRG_CODE AS SC_CODE, " +
" SM.STRG_NAME AS STRG_NAME, " + " SM.STRG_NAME AS STRG_NAME, " +
" SM.TRAN_ID AS TRAN_ID," +
" LOC.DESCR AS LOCALITY, " + " LOC.DESCR AS LOCALITY, " +
" SCT.SH_DESCR AS SH_DESCR, " + " SCT.SH_DESCR AS SH_DESCR, " +
" 'PLANNED' AS STATUS, " + " 'PLANNED' AS STATUS, " +
...@@ -2701,6 +2705,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -2701,6 +2705,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
" SC.FIRST_NAME " + " SC.FIRST_NAME " +
" || ' ' " + " || ' ' " +
" || SC.LAST_NAME AS STRG_NAME, " + " || SC.LAST_NAME AS STRG_NAME, " +
" '' AS TRAN_ID, " +
" LOC.DESCR AS Locality, " + " LOC.DESCR AS Locality, " +
" sct.sh_descr AS SH_DESCR, " + " sct.sh_descr AS SH_DESCR, " +
" 'MISSED' AS STATUS, " + " 'MISSED' AS STATUS, " +
...@@ -2765,7 +2770,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S ...@@ -2765,7 +2770,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
doctorObject.put("CUST_CODE", checkNull(rs.getString("SC_CODE"))); doctorObject.put("CUST_CODE", checkNull(rs.getString("SC_CODE")));
doctorObject.put("EVENT_DATE", checkNull(eventDate)); doctorObject.put("EVENT_DATE", checkNull(eventDate));
doctorObject.put("STATUS", checkNull(rs.getString("STATUS"))); doctorObject.put("STATUS", checkNull(rs.getString("STATUS")));
doctorObject.put("TRAN_ID", checkNull(rs.getString("TRAN_ID")));
System.out.println("sc code "+scCode); System.out.println("sc code "+scCode);
if(unListedDocList.indexOf(scCode) == -1 ) if(unListedDocList.indexOf(scCode) == -1 )
......
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