From 9accf1a971b3726c71eb1f1b72db1cac9c0abe7d Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Sun, 10 Apr 2022 18:06:58 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A1=EC=95=84=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=ED=8C=8C=EC=9D=BC=203=EA=B0=9C=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m/bf_board/M_Bf_boardController.java | 3 +- .../M_Bf_daily_nutritionBO.java | 1 + .../M_Bf_daily_nutritionBOImpl.java | 45 +++++- .../M_Bf_daily_nutritionController.java | 12 +- .../com.backoffice.m.bf_daily_nutrition.xml | 3 + .../ftl/m/bf_board/view_bf_write_board.ftl | 1 - .../ftl/m/bf_daily_nutrition/include_top.ftl | 152 ++++++++++++++++-- .../view_bf_daily_nutrition_11.ftl | 51 +++--- src/main/webapp/m/css/style.css | 9 +- 9 files changed, 241 insertions(+), 36 deletions(-) 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 e342b8d..0fd2285 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 @@ -102,8 +102,7 @@ public class M_Bf_boardController extends AbstractControllerManager { DataMap.putToModel(model, "rm", rm); List lm_pick_img = bf_boardBo.select_bf_board_img_by_b_no(paramMap); - DataMap.putToModel(model, "lm_pick_img", lm_pick_img); - + 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/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java index e06eaec..5a9f0c0 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java @@ -12,6 +12,7 @@ public interface M_Bf_daily_nutritionBO { public abstract int select_bf_daily_nutrition_list_count(DataMap paramMap) throws Exception; public abstract List select_bf_daily_nutrition_list_by_day(DataMap paramMap) throws Exception; + public abstract DataMap select_bf_daily_nutrition_by_dn_no(DataMap paramMap) throws Exception; public abstract List select_lastest_nutrition_list(DataMap paramMap) throws Exception; public abstract DataMap select_background_color(DataMap paramMap) throws Exception; diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java index c235e27..bfe7afb 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java @@ -48,6 +48,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B return lm; } + public List select_lastest_nutrition_list(DataMap paramMap) throws Exception{ List lm = null; @@ -202,12 +203,26 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B if(list_file_key.size()>0) { DataMap dm = new DataMap(); dm.put("dn_no", resultObj); - generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); + dm.put("file_tp", "10"); //육아기록 + generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); for(int idx = 0; idx < list_file_key.size(); idx++){ dm.put("file_seq", list_file_key.get(idx)); generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm); } } + + ArrayList list_hosp_file_key = (ArrayList) paramMap.get("list_hosp_file_key"); + if(list_hosp_file_key.size()>0) { + DataMap dm = new DataMap(); + dm.put("dn_no", resultObj); + dm.put("file_tp", "11"); //병원기록 + generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); + for(int idx = 0; idx < list_hosp_file_key.size(); idx++){ + dm.put("file_seq", list_hosp_file_key.get(idx)); + generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm); + } + } + generalDAO.commitTransaction(); } catch (SQLException e) { throw e; @@ -241,7 +256,9 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B ArrayList list_file_key = (ArrayList) paramMap.get("list_file_key"); DataMap dm = new DataMap(); dm.put("dn_no", paramMap.get("dn_no")); + dm.put("file_tp", "10"); //육아기록 generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); //삭제 + if(list_file_key.size()>0) { //추가 for(int idx = 0; idx < list_file_key.size(); idx++){ dm.put("file_seq", list_file_key.get(idx)); @@ -258,6 +275,32 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B } } } + + + ArrayList list_hosp_file_key = (ArrayList) paramMap.get("list_hosp_file_key"); + + dm.put("file_tp", "11"); //병원기록 + generalDAO.delete("delete_bf_daily_nutrition_img_by_b_no", dm); //삭제 + + if(list_hosp_file_key.size()>0) { //추가 + for(int idx = 0; idx < list_hosp_file_key.size(); idx++){ + dm.put("file_seq", list_hosp_file_key.get(idx)); + generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm); + } + } + + //병원기록 + if(paramMap.get("list_mt_file_hosp_seq") !=null) { //기존 내용 + list_hosp_file_key = (ArrayList) paramMap.get("list_mt_file_hosp_seq"); + dm.put("file_tp", "11"); //병원기록 + if(list_hosp_file_key.size()>0) { + dm.put("dn_no", paramMap.get("dn_no")); + for(int idx = 0; idx < list_hosp_file_key.size(); idx++){ + dm.put("file_seq", list_hosp_file_key.get(idx)); + generalDAO.insert("insert_bf_daily_nutrition_img_by_b_no", dm); + } + } + } generalDAO.delete("delete_bf_daily_nutrition_memo", paramMap); generalDAO.commitTransaction(); diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java index 383f526..135859f 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java @@ -145,6 +145,7 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ List lm_cup_tp = code_item_strBO.select_code_item_str_list(DataMap.fromNameValue("cg_cd", "BF_CUP_TP")); DataMap.putToModel(model, "lm_cup_tp", lm_cup_tp); + DataMap rm = bf_daily_nutritionBO.select_bf_daily_nutrition_by_dn_no(paramMap); if( rm.get("temperature") !=null) rm.put("temperature", rm.get("temperature").toString()); String nutirition_cd_no = RenaStringUtil.getData(rm, "nutirition_cd_no"); // BF_NU_TP_5 @@ -184,10 +185,14 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ List lm_vac = bf_daily_nutritionBO.select_db_vac_list(paramMap); DataMap.putToModel(model, "lm_vac", lm_vac); - + paramMap.put("file_tp", "10"); //육아기록 List lm_img_lst= bf_daily_nutritionBO.select_daily_image_list(paramMap); DataMap.putToModel(model, "lm_img_lst", lm_img_lst); + paramMap.put("file_tp", "11"); //병원기록 + List lm_hosp_lst= bf_daily_nutritionBO.select_daily_image_list(paramMap); + DataMap.putToModel(model, "lm_hosp_lst", lm_hosp_lst); + List lm_memo_mst = bf_daily_nutritionBO.select_memo_master(paramMap); DataMap.putToModel(model, "lm_memo_mst", lm_memo_mst); @@ -235,6 +240,8 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ }else { // 1. 프로필 사진 있을 경우 파일 처리 // ArrayList list_file_key = new ArrayList(); + // 2. 병원 진료 사진 있을 경우 파일 처리 + ArrayList list_hosp_file_key = new ArrayList(); int[] arr_thumbnail_size = new int[]{300}; boolean[] arr_thumbnail_watermark = new boolean[]{false}; HashMap mapFileMeta = fileAgent.uploadImage(paramMap,arr_thumbnail_size, arr_thumbnail_watermark, request, response, ConstantCode.DIR_WATERMARK_IMG, ConstantCode.DIR_WATERMARK_TXT); @@ -247,9 +254,12 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ paramMap.put(key, fileMeta.getMt_file_seq()); else if(key.startsWith("append_src")) list_file_key.add(String.valueOf(fileMeta.getMt_file_seq())); + else if(key.startsWith("append_hosp_src")) + list_hosp_file_key.add(String.valueOf(fileMeta.getMt_file_seq())); } } paramMap.put("list_file_key", list_file_key); + paramMap.put("list_hosp_file_key", list_hosp_file_key); } diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml index e11da6f..f6dc2c6 100644 --- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml +++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml @@ -804,10 +804,12 @@ ( dn_no ,file_seq + ,file_tp ,reg_dt ) VALUES ( #dn_no# ,#file_seq# + ,#file_tp# ,NOW() ) @@ -815,6 +817,7 @@ DELETE FROM tbl_bf_daily_nutrition_attach WHERE dn_no = #dn_no# + and file_tp = #file_tp# 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 d404eaf..991076e 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 @@ -272,7 +272,6 @@ var text = $(this).html(); var id = $(this).attr('id'); - debugger; if(id =="BF_CT_TP_4") { $("#divVote").show(); }else{ diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl index 247bde5..0d8a3cc 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl @@ -29,18 +29,18 @@
- -
-
-

프로필 사진

-

${model['rm_child']['name']!}${(model['rm_child']['m']?number/12)!}세 ${(model['rm_child']['m']?number%12)!}개월 (${model['rm_child']['gender_ko']!})

-

${model['rm']['reg_day']!}${model['rm']['reg_time']!}

-
- + +
+
+

프로필 사진

+

${model['rm_child']['name']!}${(model['rm_child']['m']?number/12)!}세 ${(model['rm_child']['m']?number%12)!}개월 (${model['rm_child']['gender_ko']!})

+

${model['rm']['reg_day']!}${model['rm']['reg_time']!}

- +
+ - + + + +
+
+
+ <#assign pick_img_index = 0> + <#if model['lm_img_lst']?has_content> + <#assign pick_img_index = model['lm_img_lst']?size> +
+ <#list model['lm_img_lst'] as item_img> +
+
+ +
+ 사진추가하기 +
+ +
+
+ +
+ <#else> + +
+
+
+ +
+ 사진추가하기 +
+ +
+
+
+ <#assign pick_img_index = pick_img_index+1> + + +
+
+
+ +