java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함.

Browse Source
dev_bert
jonghwan76 3 years ago
parent 89040e78b9
commit 79019bccb0
3 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File

29
.idea/workspace.xml
Unescape View File

@ -9,17 +9,11 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="회원가입 밸리데이션 및 유효성체크 보완 - 2">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="공유기능 퍼블리싱 및 기능 적용">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -227,7 +221,7 @@
<workItem from="1650099253570" duration="21674000" />
<workItem from="1650210956375" duration="846000" />
<workItem from="1650243545918" duration="874000" />
<workItem from="1650278800214" duration="7789000" />
<workItem from="1650278800214" duration="13150000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -481,7 +475,14 @@
<option name="project" value="LOCAL" />
<updated>1650124395162</updated>
</task>
<option name="localTasksCounter" value="37" />
<task id="LOCAL-00037" summary="공유기능 퍼블리싱 및 기능 적용">
<created>1650286771669</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1650286771669</updated>
</task>
<option name="localTasksCounter" value="38" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -501,7 +502,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
<MESSAGE value="닉네임 변경기능 적용" />
<MESSAGE value="계정 동기화 기능 수정" />
<MESSAGE value="홈화면 퍼블리싱 기능 적용" />
@ -526,6 +526,7 @@
<MESSAGE value="메모리 공유기능 적용 - 카카오, URL복사" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
<option name="LAST_COMMIT_MESSAGE" value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
<MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
<option name="LAST_COMMIT_MESSAGE" value="공유기능 퍼블리싱 및 기능 적용" />
</component>
</project>

28
src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
Unescape View File

@ -366,15 +366,12 @@
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
</select>
<select id="select_bf_daily_nutrition_list_by_day" resultClass="dataMap" parameterClass="dataMap">
</select>
<select id="select_bf_daily_nutrition_list_by_day" resultClass="dataMap" parameterClass="dataMap">
SELECT x.*
,(select group_concat(tm.memo) from tbl_bf_daily_nutrition_memo tm where tm.dn_no = x.dn_no) as memo
,REPLACE(append_src_img_file.mt_file_local_url, '/cdn001/', '') AS append_src_img_file_url
,REPLACE(append_src_img_file.mt_file_nm, '/cdn001/', '') AS append_src_img_file_nm
,REPLACE(append_300_img_file.mt_file_local_url, '/cdn001/', '') AS append_300_img_file_url
,REPLACE(append_300_img_file.mt_file_nm, '/cdn001/', '') AS append_300_img_file_nm
,(select group_concat(tm.memo) from tbl_bf_daily_nutrition_memo tm where tm.dn_no = x.dn_no) as memo
,(select file_seq from tbl_mt_file tf where mt_file_seq = x.file_seq limit 1) as file_seq
,cis_1.title AS nutirition_cd_no_title
,(select color_cd from tbl_code_item ts where ts.val_1 = cis_1.cd_no) as color_cd
,CASE
@ -452,14 +449,14 @@
(
SELECT ifnull(temperature,'') FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
)
END AS time_val
END AS time_val
FROM
(
SELECT
SELECT
x.dn_no
,x.smc_no
,x.smc_no
,DATE_FORMAT(x.baseday, '%Y.%m.%d') AS baseday
,x.append_src_img_file
,y.file_seq
,case
when x.append_300_img_file = 0 then x.append_src_img_file
else x.append_300_img_file
@ -475,15 +472,14 @@
ELSE CONCAT(TIMESTAMPDIFF(MONTH, x.reg_dt, NOW()), '달 전')
END AS ago
FROM tbl_bf_daily_nutrition x
LEFT OUTER JOIN tbl_bf_daily_nutrition_attach y on x.dn_no = y.dn_no
WHERE 1 =1
AND x.smc_no = #smc_no#
AND x.smc_no = #smc_no#
AND x.baseday = #base_dt#
) x
LEFT JOIN tbl_mt_file append_src_img_file ON x.append_src_img_file = append_src_img_file.mt_file_seq
LEFT JOIN tbl_mt_file append_300_img_file ON x.append_300_img_file = append_300_img_file.mt_file_seq
LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no
ORDER BY dn_no DESC
</select>
</select>
<select id="select_bf_daily_nutrition_list_count" resultClass="Integer" parameterClass="dataMap">
SELECT COUNT(*)

2
src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
Unescape View File

@ -269,7 +269,7 @@
<#assign memo = item['memo']!>
<#assign time_text = item['time_val']!>
</#if>
<img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
<img src="<#if item['file_seq']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['file_seq']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
</div>
<div class="main_cont_circle" style="border-color: ${item['color_cd']};"></div>
<div class="main_cont_info">

Write Preview
Loading…
Cancel
Save