diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java index 039e933..464b68c 100644 --- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java +++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java @@ -10,31 +10,10 @@ public interface M_Bf_boardBO { public abstract DataMap select_bf_view_board(DataMap paramMap) throws Exception; public abstract List select_list_bf_board(DataMap paramMap) throws Exception; public abstract List select_bf_board_img_by_b_no(DataMap paramMap) throws Exception; + public abstract List select_bf_board_vote_by_b_no(DataMap paramMap) throws Exception; + public abstract int update_bf_board(DataMap paramMap) throws Exception; public abstract Object insert_bf_board(DataMap paramMap) throws Exception; - /* - public abstract List ajax_select_bf_community_comment_list(DataMap paramMap) throws Exception; - public abstract List select_bf_community_tag_by_b_no(DataMap paramMap) throws Exception; - public abstract List select_list_bf_community(DataMap paramMap) throws Exception; - - public abstract List select_bf_community_comment_list(DataMap paramMap) throws Exception; - public abstract List select_bf_community_comment_list_child(DataMap paramMap) throws Exception; - public abstract int select_list_bf_community_count(DataMap paramMap) throws Exception; - public abstract int select_bf_community_by_b_no_comment_count(DataMap paramMap) throws Exception; - public abstract int select_bf_community_by_p_bc_id_comment_count(DataMap paramMap) throws Exception; - - public abstract int update_bf_community(DataMap paramMap) throws Exception; - public abstract int update_bf_community_comment(DataMap paramMap) throws Exception; - - public abstract int delete_bf_community_like_by_b_no(DataMap paramMap) throws Exception; - public abstract int delete_bf_community(DataMap paramMap) throws Exception; - public abstract int delete_bf_community_comment(DataMap paramMap) throws Exception; - - public abstract Object insert_bf_community_like_by_b_no(DataMap paramMap) throws Exception; - public abstract Object insert_bf_community(DataMap paramMap) throws Exception; - public abstract Object insert_bf_community_comment(DataMap paramMap) throws Exception; - */ - } diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java index 35974ff..5a83a91 100644 --- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java @@ -53,6 +53,18 @@ public class M_Bf_boardBOImpl extends AbstractBOManager implements M_Bf_boardBO return lm; } + public List select_bf_board_vote_by_b_no(DataMap paramMap) throws Exception{ + List lm = null; + + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + lm = generalDAO.select_to_list("select_bf_board_vote_by_b_no", paramMap); + } catch (SQLException e) { + throw e; + } + + return lm; + } public Object insert_bf_board(DataMap paramMap) throws Exception{ @@ -68,12 +80,21 @@ public class M_Bf_boardBOImpl extends AbstractBOManager implements M_Bf_boardBO String bd_no = String.valueOf(resultObj); DataMap dm = new DataMap(); dm.put("bd_no", bd_no); - + ArrayList list_file_key = (ArrayList) paramMap.get("list_file_key"); - for(int idx = 0; idx < list_file_key.size(); idx++){ - dm.put("file_seq", list_file_key.get(idx)); - generalDAO.insert("insert_bf_board_img_by_b_no", dm); - } + if(list_file_key !=null) { + for(int idx = 0; idx < list_file_key.size(); idx++){ + dm.put("file_seq", list_file_key.get(idx)); + generalDAO.insert("insert_bf_board_img_by_b_no", dm); + } + } + ArrayList list_vote_content = (ArrayList) paramMap.get("list_vote_content"); + if(list_vote_content !=null) { + for(int idx = 0; idx < list_vote_content.size(); idx++){ + dm.put("v_content", list_vote_content.get(idx)); + generalDAO.insert("insert_bf_board_vote_by_b_no", dm); + } + } generalDAO.commitTransaction(); } catch (SQLException e) { @@ -112,7 +133,15 @@ public class M_Bf_boardBOImpl extends AbstractBOManager implements M_Bf_boardBO generalDAO.update("insert_bf_board_img_by_b_no", map_img); } } - + DataMap dm = new DataMap(); + dm.put("bd_no", bd_no); + generalDAO.delete("delete_bf_board_vote_by_b_no", paramMap); + ArrayList list_vote_content = (ArrayList) paramMap.get("list_vote_content"); + for(int idx = 0; idx < list_vote_content.size(); idx++){ + dm.put("v_content", list_vote_content.get(idx)); + generalDAO.insert("insert_bf_board_vote_by_b_no", dm); + } + generalDAO.commitTransaction(); } catch (SQLException e) { throw e; diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java index 3138ee6..e342b8d 100644 --- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java +++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java @@ -103,6 +103,7 @@ public class M_Bf_boardController extends AbstractControllerManager { List lm_pick_img = bf_boardBo.select_bf_board_img_by_b_no(paramMap); DataMap.putToModel(model, "lm_pick_img", lm_pick_img); + } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} diff --git a/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml b/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml index 234cdd9..64da513 100644 --- a/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml +++ b/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml @@ -9,6 +9,7 @@ ,m.name ,tmf.mt_file_seq ,tmf.mt_file_local_url + ,v_content FROM ( SELECT x.bd_no @@ -27,10 +28,13 @@ from tbl_bf_board_comment tbc where tbc.bd_no = x.bd_no ) as c_nt ,DATE_FORMAT(x.reg_dt,'%H:%i') reg_tm + ,tbv.v_content FROM tbl_bf_board x INNER JOIN tbl_code_item z on x.bd_tp = z.val_1 and cg_cd ='BF_COMMUNITY_TP' - WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') + LEFT JOIN (select bd_no, group_concat(concat (v_content, '♭⊙♭', nvl(v_nt, 0)) separator '♭§♭') v_content + from tbl_bf_board_vote) tbv ON tbv.bd_no = x.bd_no + WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') and x.use_yn ='Y' AND member_id = #member_id# @@ -60,6 +64,7 @@ ,m.name ,tmf.mt_file_seq ,tmf.mt_file_local_url + ,v_content FROM ( SELECT x.bd_no @@ -78,14 +83,17 @@ from tbl_bf_board_comment tbc where tbc.bd_no = x.bd_no ) as c_nt ,DATE_FORMAT(x.reg_dt,'%H:%i') reg_tm + ,tbv.v_content FROM tbl_bf_board x + LEFT JOIN (select bd_no, group_concat(concat (v_content, '♭⊙♭', nvl(v_nt, 0)) separator '♭§♭') v_content + from tbl_bf_board_vote) tbv ON tbv.bd_no = x.bd_no INNER JOIN tbl_code_item z on x.bd_tp = z.val_1 and cg_cd ='BF_COMMUNITY_TP' WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') and x.use_yn ='Y' and x.bd_no = #bd_no# )x - INNER JOIN tbl_member m ON m.member_id = x.member_id + INNER JOIN tbl_member m ON m.member_id = x.member_id LEFT JOIN tbl_bf_board_attach tba ON tba.bd_no = x.bd_no LEFT JOIN tbl_mt_file tmf ON tmf.mt_file_seq = tba.file_seq @@ -129,10 +137,27 @@ ) + + INSERT tbl_bf_board_vote + ( + bd_no + ,v_content + ,reg_dt + ) VALUES ( + #bd_no# + ,#v_content# + ,NOW() + ) + + DELETE FROM tbl_bf_board_attach WHERE bd_no = #bd_no# + + DELETE FROM tbl_bf_board_vote + WHERE bd_no = #bd_no# + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl index 6d1755b..827b95b 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl @@ -88,18 +88,41 @@
${item['l_nt']!}
${item['c_nt']!}
- - -
-
- ${item['title']!} -
- <#if item['mt_file_seq']?has_content > -
- -
- -
+ + + <#if item['bd_tp']?contains("BF_CT_TP_4")> +
+
+ ${item['title']!} +
+ <#if item['v_content']?has_content > + <#list item['v_content']?split("♭§♭") as vote> +
+
+
    +
  • +

    ${vote?substring(0,vote?index_of("♭⊙♭"))}

    +

    ${vote?substring(vote?index_of("♭⊙♭")+3, vote?length)}개

    +
    • +
+
+
+ + +
+ <#else> +
+
+ ${item['title']!} +
+ <#if item['mt_file_seq']?has_content > +
+ +
+ +
+ +

${item['name']!}

diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl index b2ec0d5..b5fb144 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl @@ -23,8 +23,7 @@ -

카테고리(필수)

- +

카테고리(필수)

${model['rm']['bd_tp_nm']!}<#else>selectbox">카테고리 선택

@@ -35,11 +34,8 @@
-
- - - - +
+

이미지(선택)

@@ -87,30 +83,29 @@
- +
- <#if model['bd_tp']! =='BF_CT_TP_4'> +
+

내용(필수)

+ +
+ + +
+
+ <#if model['bd_tp']! =='BF_CT_TP_4'>

추가

투표내용(필수)

-
    -
  • - +
      +
    • +   
-
- <#else> -
-

내용(필수)

- -
- - -
-
+

태그입력(선택)

@@ -138,8 +133,7 @@ - - + @@ -160,36 +154,33 @@ return; } + if(content == ''){ - <#if model['bd_tp']! =='BF_CT_TP_4'> - $("input[name=vote_content]").each( function(idx,ele) { - debugger; - if (ele.value =="") { - alert("투표내용을 입력하세요!"); - return; - } - }); - - if( $("input[name=vote_content]").length ==0 ) { - alert("투표내용을 추가 입력하세요!"); + + + } + <#if model['bd_tp']! =='BF_CT_TP_4'> + $("input[name=vote_content]").each( function(idx,ele) { + if (ele.value =="") { + alert("투표내용을 입력하세요!"); return; } - - <#else> - alert('내용을 입력해주세요'); + }); + + if( $("input[name=vote_content]").length ==0 ) { + alert("투표내용을 추가 입력하세요!"); return; - - }else{ - tag = $(".li_tag").get(); - params = ''; - for(var i = 0 ; i < tag.length ; i++){ - params += tag[i].innerText + ','; - } - $('#frmInsert').children('#list_tag').val(params); - $('#frmInsert').children('#bd_tp').val(bd_tp); - $('#frmInsert').children('#pick_img_index').val(pick_img_index); - $('#frmInsert').submit(); + } + + tag = $(".li_tag").get(); + params = ''; + for(var i = 0 ; i < tag.length ; i++){ + params += tag[i].innerText + ','; } + $('#frmInsert').children('#list_tag').val(params); + $('#frmInsert').children('#bd_tp').val(bd_tp); + $('#frmInsert').children('#pick_img_index').val(pick_img_index); + $('#frmInsert').submit(); } var pick_img_index = "${pick_img_index!'0'}"; @@ -281,8 +272,12 @@ $("body").on("click", ".selectlist p", function() { var text = $(this).html(); - var id = $(this).attr('id'); - + var id = $(this).attr('id'); + if(id =="BF_CT_TP_4") { + $("#divVote").show(); + }else{ + $("#divVote").hide(); + } $(this).parent().siblings().html(text); $(this).parent().siblings().attr('id',id); $(this).parent().toggle(); @@ -326,8 +321,8 @@ } function fncAddVote() { - var tag="
  • "; - tag +=" "; + var tag="
  • "; + tag +=" "; tag +="   "; tag +="
    • "; $("#nutrition_kinds_basic3").append(tag); diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index a6a79e9..007546b 100644 --- a/src/main/webapp/m/css/style.css +++ b/src/main/webapp/m/css/style.css @@ -13755,6 +13755,17 @@ main.sona_cont_measurement { justify-content: space-between; margin-bottom: 20px; } + + .text_line{ + border: 0; + font-size: 12px; + text-align: left; + outline: 0; + border: 1px solid #CFCFCF; + width: 95%; + height: 28px; + margin: 2px 2px 2px 4px; + } .text_flex p, .text_box p {