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

Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf.git into devs

Browse Source
dev_bert
kyebyungha 3 years ago
parent a63c2f247a 0f0107a61e
commit 6bec5be1bd
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
Unescape View File

@ -7,6 +7,7 @@
DATE_FORMAT(b.reg_dt, '%d') as dd,
DATE_FORMAT(b.reg_dt, '%H') * 4.15 as hour,
LPAD(c.val_1, 2, '0') as val_1,
c.title as title,
count(*) as cnt
FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
@ -139,6 +140,7 @@
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
WHERE
a.smc_no = #smc_no#
and b.reg_dt between date_add(now(),interval -1 month ) and now()
ORDER BY b.reg_dt
</select>

14
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
Unescape View File

@ -71,7 +71,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
@ -86,7 +86,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
@ -101,7 +101,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
@ -116,7 +116,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
@ -131,7 +131,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
@ -146,7 +146,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>
@ -161,7 +161,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
<span title="${item.title}" style="top:${topP}%;height:2px;" class="m_color${item['val_1']}"></span>
</#if>
</#list>
</li>

Write Preview
Loading…
Cancel
Save