Commit 37a07241 authored by cmahajan's avatar cmahajan

Changes made for work with column in compl mtd report.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102598 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e105d57c
......@@ -824,7 +824,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
pstmt = null;
//Code for db2 Start
sql = "SELECT SM.TRAN_ID, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, SM.STRG_CODE,SM.STRG_NAME" +
sql = "SELECT SM.TRAN_ID, SP.SH_NAME AS WORK_WITH, SM.PLAN_ID, SM.EVENT_DATE, SM.EVENT_TYPE, SM.STRG_CODE,SM.STRG_NAME" +
", CUST1.FIRST_NAME AS CUST_FNAME, SM_ITEM.QUANTITY, SM_ITEM.BRIEFED_DESCR, SM_ITEM.ITEM_CODE" +
", ITEM.DESCR AS ITEM_DESCR, CUST1.MIDDLE_NAME CUST_MNAME , CUST1.LAST_NAME AS CUST_LNAME " +
", SM.STRG_TYPE, SM.STRG_NO_VISIT, SM.EVENT_TIME_START, SM.EVENT_TIME_END, SM.STRG_CLASS_CODE " +
......@@ -846,6 +846,8 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
" LEFT JOIN STRG_MEET_ITEMS SM_ITEM ON SM_ITEM.DCR_ID = SM.DCR_ID and SM_ITEM.strg_code = SM.strg_code " +
" LEFT JOIN ITEM ITEM ON ITEM.ITEM_CODE = SM_ITEM.ITEM_CODE " +
" LEFT JOIN LOCALITY ON LOCALITY.LOCALITY_CODE=SM.LOCALITY_CODE " +
" LEFT JOIN STRG_MEET_TEAM SMT ON SM.DCR_ID = SMT.DCR_ID AND SM.STRG_CODE = SMT.STRG_CODE " +
" LEFT JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SPRS_CODE__WW " +
" WHERE SM.DCR_ID = '"+dcrId+"' AND CUST_CLASS.CUST_TYPE ='D' AND SM.STRG_TYPE = 'D'" +
" ORDER BY SM.STRG_CODE";
//Code for db2 End
......@@ -920,6 +922,7 @@ public class ComplianceDB2 extends ValidatorEJB implements ComplianceDB2Local, C
rowData.put("remrks_doctor", remarksDescr);
rowData.put("locality_doctor", checkNull(rs.getString("LOC_DESCR"))); //Show locality on table
rowData.put("strg_code_doctor", checkNull(rs.getString("STRG_CODE")));
rowData.put("work_with", checkNull(rs.getString("WORK_WITH")));
complDayWiseDetailJson.put(count, rowData);
count++;
doctorCount++;
......
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