Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -r4bc12f22d19e679a740674c2f86aedef69ecbff8 -re58c144da161fd4ea97d78daa458d3f541364812 --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision 4bc12f22d19e679a740674c2f86aedef69ecbff8) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision e58c144da161fd4ea97d78daa458d3f541364812) @@ -1992,7 +1992,7 @@ } @Override - public void finalizeMinMaxSession ( Integer userId , Integer sessionId , Transmission[] transmissionArray , int siteId , boolean onlyForSingleSite ) { + public void finalizeMinMaxSession (Integer userId , Integer sessionId , Transmission[] transmissionArray , Boolean reviewOnly, int siteId , boolean onlyForSingleSite ) { long start = System.currentTimeMillis ( ); java.sql.Date now = new java.sql.Date ( new java.util.Date ( ).getTime ( ) ); @@ -2053,6 +2053,7 @@ " NVL(a.max_stocking_qty,0) * NVL(c.golden_price,0) - NVL(a.curr_max, 0) * NVL(c.golden_price, 0) else 0 end depthDec\n" + "FROM session_site_product a, product c\n" + "WHERE session_id = ? AND a.site_id " + ( onlyForSingleSite ? ( " = " + siteId ) : ( " IN (SELECT site_id FROM session_site WHERE session_Id = " + sessionId + " )" ) ) + "\n" + + "AND (a.reviewed " + (reviewOnly ? ("=1)") : ("IN (select reviewed from session_site_product where session_id =" +sessionId + ") or reviewed is null or reviewed =0 or reviewed=1 and session_id = "+sessionId + " )")) +" \n" + "AND a.product_id = c.product_id)\n" + "group by site_id,site_short_name,session_id) s \n" + "on (ss.session_id=s.session_id and ss.site_id=s.site_id)\n" + @@ -2075,9 +2076,9 @@ "INNER JOIN PRODUCT P ON SSP.PRODUCT_ID = P.PRODUCT_ID\n" + "INNER JOIN min_max_calc_line cl ON cl.field_abbr = p.field_abbr\n" + "INNER JOIN pulse_config pc ON pc.config_code = 'FILTERS_LEAD_TIME'\n" + - "WHERE SSP.SESSION_ID = ?)"; + "WHERE SSP.SESSION_ID = ? and (SSP.reviewed "+ (reviewOnly ? ( "=1))" ) : ("IN (select ssp.reviewed from session_site_product ssp where ssp.session_id = "+sessionId + ") or ssp.reviewed is null or ssp.reviewed =0 or ssp.reviewed=1 and ssp.session_id = "+sessionId + " ))")); jdbcTemplate.update ( insertTransmissionSQL , sessionId ); -// System.out.println("inserttransmission" +insertTransmissionSQL); +// List sites = jdbcTemplate.queryForList ( "SELECT SITE_ID FROM SESSION_SITE WHERE SESSION_ID = ? " , new Object[]{sessionId} , Integer.class ); @@ -2100,7 +2101,7 @@ + " BLOCK_ORDER, BLOCK_RETURN, USER_ID, REASON_ID, FORECAST_MODEL_ID, CLUSTER_PCT_SALE, DC_SALES_LAST_12_MONTHS, " + " DC_SALES_LAST_24_MONTHS, TRANSFER_12_MONTHS, TRANSFER_24_MONTHS, PEER_SALES_12, REVIEWED, FLEET_FLAG, SYSTEM_FLAG, SYSTEM_RECOMMENDED, " + " EDIT_LINKED_SIM_PROD_ID, SIMILAR_PRODUCT_EDIT, DECLINE_ORDER, DECLINE_RETURN, LAST_SALE_DT, BUSINESS_RULES_APPLIED, HQ_ORDER_QTY, HQ_KEEP_QTY,ORG_MIN_STOCKING_QTY,ORG_MAX_STOCKING_QTY " - + " from session_site_product where site_Id = ? and session_id = ?)" , s , sessionId ); + + " from session_site_product where site_Id = ? and session_id = ? and (reviewed "+ (reviewOnly ? (" =1)) ") : ("IN (select reviewed from session_site_product where session_id =" +sessionId + ") or reviewed is null or reviewed =0 or reviewed=1 and session_id = "+sessionId + " ))") ), s , sessionId ) ; } @@ -2315,7 +2316,7 @@ @Override public List getFailedTransmissions ( User user ) { List transmissions = jdbcTemplate.query ( - "SELECT transmission_id AS transmissionId, session_id AS sessionId, " + "SELECT transmission_id AS transmissionId, session_id AS sessionId, t.site_id as siteId," + " CASE WHEN tso.TRANSMISSION_STATUS_CD IN ('MFR', 'MFP', 'MFL') OR tsr.TRANSMISSION_STATUS_CD IN ('MFR', 'MFP', 'MFL') THEN 'MIO' ELSE 'TAMS' END AS system, " + " CASE WHEN (tso.TRANSMISSION_STATUS_CD IN ('MFR', 'MFP', 'MFL') OR (tso.TRANSMISSION_STATUS_CD IN ('PP', 'S') and order_status_date < sysdate-1)) AND order_notification_date is null THEN 1 ELSE 0 END AS isOrder, " + " CASE WHEN (tsr.TRANSMISSION_STATUS_CD IN ('MFR', 'MFP', 'MFL') OR (tsr.TRANSMISSION_STATUS_CD IN ('PP', 'S') and return_status_date < sysdate -1)) AND return_notification_date is null THEN 1 ELSE 0 END AS isReturn, " @@ -2329,6 +2330,7 @@ FailedTransmission transmission = new FailedTransmission ( ); transmission.setTransmissionId ( rs.getInt ( "transmissionId" ) ); transmission.setSessionId ( rs.getInt ( "sessionId" ) ); + transmission.setSiteId (rs.getInt ( "siteId" ) ); transmission.setOrder ( rs.getInt ( "isOrder" ) == 1 ); transmission.setReturn ( rs.getInt ( "isReturn" ) == 1 ); transmission.setSystem ( rs.getString ( "system" ) );