Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -reaa6eb218e1cfd723aafff36394ed9d0b5585203 -rf8ec06bc81c56c986e7660f82f1201330e66906a --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision eaa6eb218e1cfd723aafff36394ed9d0b5585203) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision f8ec06bc81c56c986e7660f82f1201330e66906a) @@ -440,7 +440,8 @@ + "(select TRIM(FIRST_NAME || ' ' || LAST_NAME) from pulse_user where user_id=TBL.SUBMITTAL_USER_ID) as \"submittalUser\", " + "(case when b.SITE_TYPE_CODE='DC' then 1 else 0 end) as \"includesDCs\", DOLLAR_LIMIT as \"dollarLimit\", " + "(select TRIM(FIRST_NAME || ' ' || LAST_NAME) from pulse_user where user_id=TBL.FINALIZE_USER_ID) as \"finalizedBy\", " - + "FINALIZE_DATE as \"finalizedDate\", FINALIZE_USER_ID as \"finalizedById\" " + + "FINALIZE_DATE as \"finalizedDate\", FINALIZE_USER_ID as \"finalizedById\" , " + +" nvl(is_group_code,0) as \"isGroupCode\" " + " FROM PULSE_SESSION TBL " + " INNER JOIN SESSION_STATUS STATUS ON STATUS.STATUS_ID = TBL.STATUS_ID " + " INNER JOIN PULSE_USER PU ON PU.USER_ID = TBL.CREATED_USER_ID " @@ -471,6 +472,7 @@ sessionDetailsDTO.setIncludeHubSpokeOrderOption(rs.getString("includeHSOrder") == null ? null : rs.getString("includeHSOrder")); sessionDetailsDTO.setIncludeHubSpokeReturnOption(rs.getString("includeHSReturn") == null ? null : rs.getString("includeHSReturn")); sessionDetailsDTO.setDisplayQty1 ( rs.getString ( "displayQty1" ) ); + sessionDetailsDTO.setGroupCode(rs.getBoolean("isGroupCode")); Date fd = rs.getDate("finalizedDate"); if (fd != null) { sessionDetailsDTO.setFinalizedDate(sdf.format(fd)); @@ -567,7 +569,11 @@ Integer val = jdbcTemplate.queryForObject("select SETTING_ID from MIN_MAX_SESSION_SETTING where SETTING_CODE = 'MINGTPERCAR' AND SETTING_TYPE = 'MIN' ", Integer.class); perCarMinMaxCode = val != null ? val : 0; } + if(isGroupCode==null) + isGroupCode=false; + Boolean finalIsGroupCode = isGroupCode; + String salesSettingCode = ("MM").equals(sessionType) ? jdbcTemplate.queryForObject("select SETTING_CODE from MIN_MAX_SESSION_SETTING where SETTING_TYPE = 'Sales' and SETTING_ID = " + salesHistoryValue, String.class) : null; KeyHolder keyHolder = new GeneratedKeyHolder(); @@ -578,9 +584,9 @@ + "(STATUS_ID, CREATED_DATE, CREATED_USER_ID, SESSION_COMMENT, LAST_MODIFIED_DATE, SESSION_DESC, " + "INCLUDE_OVERSTOCK, INCLUDE_SPECIALS, INCLUDE_OBSOLETES, INCLUDE_ORDERS, INCLUDE_RETURNS, INCLUDE_LT_STD_PKG, SESSION_TYPE_CODE, " + "CREATED_ROLE_ID, EXPIRATION_DATE, INCLUDE_FLEETS, INCLUDE_SYSTEMS, USE_INV_COLL, PER_CAR_ORDER, PROVIDE_STORE_DEPTH, " - + "CREATED_FROM_SESSION_ID, INCLUDE_SALES_DEMAND, INCLUDE_NEW_NUMBERS, INCLUDE_ORDER_ALL, DOLLAR_LIMIT,NEW_NUMBER_DAYS,MIN_MAX_SALES_SETTING,INCLUDE_HS_ORDER,INCLUDE_HS_RETURN, APPLICATION_PARTS_ONLY, EXCLUDE_DISPLAY_ITEM) " + + "CREATED_FROM_SESSION_ID, INCLUDE_SALES_DEMAND, INCLUDE_NEW_NUMBERS, INCLUDE_ORDER_ALL, DOLLAR_LIMIT,NEW_NUMBER_DAYS,MIN_MAX_SALES_SETTING,INCLUDE_HS_ORDER,INCLUDE_HS_RETURN, APPLICATION_PARTS_ONLY, EXCLUDE_DISPLAY_ITEM , IS_GROUP_CODE) " + "VALUES (?, sysdate, ?, ?, sysdate, ?, " - + "?, ?, ?, ?, ?, ?, ?, ?, least(?, sysdate+30), ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?)", + + "?, ?, ?, ?, ?, ?, ?, ?, least(?, sysdate+30), ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?)", new String[]{"SESSION_ID"}); ps.setInt(1, deferCreation ? 14 : 2); ps.setInt(2, user.getUserId()); @@ -616,6 +622,7 @@ ps.setString(27, includeHubSpokeReturnOption); ps.setBoolean(28, applicationPartsOnly); ps.setString ( 29,displayQty ); + ps.setBoolean(30, finalIsGroupCode); return ps; }, keyHolder); Index: src/main/java/com/napa/pulse/dto/SessionDetailsDTO.java =================================================================== diff -u -r62d7bfbd0b173c5928bb1c4316a8bf4c99c94ead -rf8ec06bc81c56c986e7660f82f1201330e66906a --- src/main/java/com/napa/pulse/dto/SessionDetailsDTO.java (.../SessionDetailsDTO.java) (revision 62d7bfbd0b173c5928bb1c4316a8bf4c99c94ead) +++ src/main/java/com/napa/pulse/dto/SessionDetailsDTO.java (.../SessionDetailsDTO.java) (revision f8ec06bc81c56c986e7660f82f1201330e66906a) @@ -5,6 +5,16 @@ private int sessionId; private String displayQty1; + public Boolean getGroupCode() { + return isGroupCode; + } + + public void setGroupCode(Boolean groupCode) { + isGroupCode = groupCode; + } + + private Boolean isGroupCode; + public String getDisplayQty1 ( ) { return displayQty1; }