From eb392b8e366ed1002473168c9e6cc5f3bd591b30 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 11 Jul 2022 10:29:47 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EA=B8=B0=ED=83=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98,=20=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 아이 order 오류 수정 - 기록단에서 아이 개월 문제 수정 - 의사 표기 띄어쓰기 수정 - 홈화면 기록 밀리는 문제 수정, 기록 카드 간격 조정 --- .../M_Bf_family_babyBOImpl.java | 3 ++- .../M_Bf_family_babyController.java | 11 ++++++++++ .../com.backoffice.m.bf_daily_nutrition.xml | 22 ++++++++++--------- .../com.backoffice.m.bf_family_baby.xml | 10 ++++++++- .../memory/com.backoffice.m.memory.memory.xml | 2 +- .../ftl/m/bf_daily_nutrition/include_top.ftl | 2 +- .../WEB-INF/views/ftl/m/index/index.ftl | 4 ++-- 7 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java index 37c011e..fcf211b 100644 --- a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java @@ -236,8 +236,9 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa generalDAO.startTransaction(); generalDAO.delete("delete_bf_family_baby_disease_by_smc_no", paramMap); + generalDAO.delete("delete_bf_family_baby_order", paramMap); result = generalDAO.delete("delete_bf_family_baby_single", paramMap); - + generalDAO.commitTransaction(); } catch (SQLException e) { throw e; diff --git a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java index 65bc5ce..efb9f37 100644 --- a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java +++ b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java @@ -183,11 +183,22 @@ public class M_Bf_family_babyController extends AbstractControllerManager{ if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "birth_height"))== true) paramMap.put("birth_height", 0); if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "birth_head")) == true) paramMap.put("birth_head", 0); + + // 3. 입력 or 수정 PROCESS 및 메세지 작성 String smc_no = RenaStringUtil.getData(paramMap, "smc_no"); if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "smc_no"))){ smc_no = String.valueOf(bf_family_babyBO.insert_bf_family_baby(paramMap)); + List lm_child = bf_family_babyBO.select_bf_family_baby_list(paramMap); + DataMap.putToModel(model, "lm_child", lm_child); + ArrayList> order_list = new ArrayList<>(); paramMap.put("smc_no", smc_no); + HashMap order = new HashMap(); + order.put("smc_no", smc_no); + order.put("smc_order", lm_child.size()); + order_list.add(order); + paramMap.put("order_list", order_list); + bf_family_babyBO.insert_bf_family_baby_order(paramMap); log.info("-------------신규 smc_no 11 --------------- : " + smc_no); ra.addFlashAttribute("script_msg", "등록되었습니다"); 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 de99b83..16f337c 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 @@ -464,7 +464,7 @@ ) WHEN cis_1.cd_no = 'BF_NU_TP_11' THEN ( - SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup),'') + SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사: ', doctor_nm, ', 증상: ', checkup),'') FROM tbl_bf_daily_nutrition_11 tn1 WHERE tn1.dn_no = x.dn_no ) @@ -514,12 +514,12 @@ FROM tbl_bf_daily_nutrition x WHERE 1 =1 AND x.smc_no = #smc_no# - AND x.baseday = #base_dt# + AND DATE_FORMAT(x.reg_dt, '%Y-%m-%d') = #base_dt# AND x.nutirition_cd_no != '' ) x LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no ) z WHERE z.time_val is not null - ORDER BY dn_no DESC + ORDER BY mod_dt DESC - + INSERT tbl_bf_daily_nutrition - ( + ( reg_dt ,smc_no ,baseday @@ -826,8 +826,8 @@ NOW() ,#smc_no# ,#baseday# - ,#append_src_img_file# - ,#append_300_img_file# + ,#append_src_img_file# + ,#append_300_img_file# ,#nutirition_cd_no# ) @@ -1105,7 +1105,7 @@ ,allergy_cd_no ,db_dn_no ,db_dn_tp - ,weight + ,weight ,eat_qty ) VALUES ( STR_TO_DATE(concat(#reg_date#,' ', #reg_time#) ,'%Y.%m.%d %l:%i %p') @@ -1125,7 +1125,9 @@ ,#allergy_cd_no# ,#db_dn_no# ,#db_dn_tp# - ,#weight# + + ,#eat_qty#/(SELECT srv from tbl_db_nutrient where dn_no=(#db_dn_no#)) + ,#eat_qty# ) @@ -1369,7 +1371,7 @@ ,#allergy_cd_no# ,#db_dhb_no# ,#db_dhb_tp# - ,#weight# + ,#eat_qty#/100 ,#eat_qty# ) diff --git a/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml b/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml index ff33894..a8b6e14 100644 --- a/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml +++ b/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml @@ -109,7 +109,8 @@ FROM ( SELECT - x.smc_no + z.smc_order + ,x.smc_no ,x.name ,x.gender ,DATE_FORMAT(x.birthday, '%Y-%m-%d') as birthday @@ -141,6 +142,7 @@ ,(select d_title from tbl_d_day td where td.smc_no = x.smc_no and date_format(d_day, '%Y-%m-%d') >= date_format(now(), '%Y-%m-%d') order by td.d_day limit 1) as d_title FROM tbl_bf_family_baby x INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no + LEFT JOIN tbl_bf_family_baby_order z on x.smc_no = z.smc_no WHERE 1 =1 AND y.member_id = #member_id# ORDER BY x.smc_no @@ -150,6 +152,8 @@ LEFT JOIN tbl_mt_file append_300_img_file ON x.append_300_img_file = append_300_img_file.mt_file_seq + + ORDER BY x.smc_order