계정연동 취소하기 기능적용-1

dev_bert
jonghwan76 3 years ago
parent 2feb2719b5
commit eb4775194c

@ -9,23 +9,20 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="체크리스트 오류 수정">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
<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/m/bf_food/M_Bf_foodBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryBO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java" 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/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.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_timeline_share.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.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$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" 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" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_logout.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_logout.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -71,7 +68,7 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env" />
<property name="project.structure.last.edited" value="프로젝트" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
@ -80,8 +77,8 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\index" />
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\member_env" />
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\index" />
<recent name="C:\project\bf\src\main\webapp\m\js" />
<recent name="C:\project\bf\src\main\webapp\static\js" />
<recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\bf_food" />
@ -248,6 +245,8 @@
<workItem from="1650851675151" duration="3750000" />
<workItem from="1650880342548" duration="16000" />
<workItem from="1650881164110" duration="14717000" />
<workItem from="1651074703299" duration="129000" />
<workItem from="1651149304746" duration="11803000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -564,7 +563,14 @@
<option name="project" value="LOCAL" />
<updated>1650806994907</updated>
</task>
<option name="localTasksCounter" value="46" />
<task id="LOCAL-00046" summary="체크리스트 오류 수정">
<created>1651074067731</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1651074067731</updated>
</task>
<option name="localTasksCounter" value="47" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -584,7 +590,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="D-Day 관리기능 적용" />
<MESSAGE value="D-Day 관리기능 적용-2" />
<MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
<MESSAGE value="회원가입 오류 수정" />
@ -609,6 +614,7 @@
<MESSAGE value="소셜회원가입 오류수정" />
<MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
<MESSAGE value="아이디 저장기능 적용" />
<option name="LAST_COMMIT_MESSAGE" value="아이디 저장기능 적용" />
<MESSAGE value="체크리스트 오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="체크리스트 오류 수정" />
</component>
</project>

@ -230,7 +230,7 @@ public class M_LoginController extends AbstractControllerManager{
String arr[] = new String[7];
arr[0] = "sms"; // SMS/LMS 발송 구분
arr[2] = "폰 인증"; // LMS 발송 시 제목으로 사용 SMS 발송 시는 수신자에게 내용이 보이지 않습니다.
arr[3] = "[이유식당] 아 정보가 연동되었습니다."; // 본문 (90byte 제한: SMS의 경우)
arr[3] = "[이유식당] 아 정보가 연동되었습니다."; // 본문 (90byte 제한: SMS의 경우)
arr[4] = ConstantSystem.API_SENDNUM; // 발신 번호(010-0000-0000 or 01000000000)
arr[6] = "0"; // 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
String api_id = ConstantSystem.API_ID;
@ -510,8 +510,8 @@ public class M_LoginController extends AbstractControllerManager{
gmUtil.redirectParam(model, m_map);
// redirect_url = "m/login/native_login";
redirect_url = "redirect:/m/index/index.do";
redirect_url = "m/login/native_login";
// redirect_url = "redirect:/m/index/index.do";
}else{
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code

@ -12,6 +12,7 @@ import javax.servlet.http.HttpSession;
import com.backoffice.logic.FoodScoreCalculation;
import com.backoffice.logic.NutrientScoreCalculation;
import com.backoffice.m.index.M_IndexBO;
import com.gabia.api.ApiClass;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -119,6 +120,26 @@ public class M_Member_envController extends AbstractControllerManager{
DataMap sync_member_info = member_envBO.select_sync_member_email(paramMap);
List<DataMap> member_list = member_envBO.select_sync_member_list(paramMap);
//함께하는 사용자 연동완료 메시지 발송 ------------------------------ 시작
String arr[] = new String[7];
arr[0] = "sms"; // SMS/LMS 발송 구분
arr[2] = "폰 인증"; // LMS 발송 시 제목으로 사용 SMS 발송 시는 수신자에게 내용이 보이지 않습니다.
arr[3] = "[이유식당] 아기 정보가 연동되었습니다."; // 본문 (90byte 제한: SMS의 경우)
arr[4] = ConstantSystem.API_SENDNUM; // 발신 번호(010-0000-0000 or 01000000000)
arr[6] = "0"; // 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
String api_id = ConstantSystem.API_ID;
String api_key = ConstantSystem.API_KEY;
ApiClass api = new ApiClass(api_id, api_key);
for(int i=0;i<member_list.size();i++) {
String phone_num = member_list.get(i).getString("phone_num");
//String s_no = String.valueOf(apiSMSBO.insert_sms_log(paramMap));
arr[1] = "sync_baby"; // 발송 결과 확인을 위한 고객이 생성 관리 하는 Unique Key (MAX 40byte) (해당 키를 이용하여 어떤 발송 건인지에 대한 구분을 해줌. 겹치지 않을만한 무작위 문자열)
arr[5] = phone_num; // 수신 번호(010-0000-0000 or 01000000000)
String responseXml = api.send(arr);
}
//함께하는 사용자 연동완료 메시지 발송 ------------------------------ 종료
DataMap.putToModel(model, "member_info", sync_member_info);
DataMap.putToModel(model, "member_list", member_list);
}
@ -129,6 +150,40 @@ public class M_Member_envController extends AbstractControllerManager{
return redirect_url;
}
/**
* > >
* @param model
* @param request
* @param response
* @param ra
* @return
*/
@RequestMapping(value="setting_sync_cancel")
public String setting_sync_cancel(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
String view_nm = RenaStringUtil.getData(paramMap, "view_nm");
String redirect_url = "m/member_env/setting_sync_confirm_end";
try {
boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
if(is_login == false) {
ra.addFlashAttribute("call_native_login", "Y");
redirect_url = "redirect:/m/login/view_login.do";
}else{
HttpSession session = request.getSession(false);
DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
paramMap.put("email", rm_mem.get("email"));
List<DataMap> member_list = member_envBO.select_sync_member_list(paramMap);
DataMap.putToModel(model, "member_list", member_list);
}
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
gmUtil.redirectParam(model, paramMap);
return redirect_url;
}
@RequestMapping(value="setting_nm")
public String setting_nm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
@ -960,9 +1015,12 @@ public class M_Member_envController extends AbstractControllerManager{
int iResult = member_envBO.delete_tbl_member_category(paramMap);
List<String> record_list = (List<String>) paramMap.get("list_record_list");
List<String> view_yn_list = (List<String>) paramMap.get("list_view_yn");
int idx = 0;
for(String cd_no:record_list) {
paramMap.put("cd_no", cd_no);
paramMap.put("view_yn", view_yn_list.get(idx));
paramMap.put("order_no", idx++);
int iResult2 = member_envBO.insert_tbl_member_category(paramMap);
}

@ -186,6 +186,7 @@
XA.title,
XA.val_1,
XA.color_cd,
XA.view_yn,
case
when y_order_no is not null then XA.y_order_no
else x_order_no
@ -198,6 +199,7 @@
val_1,
x.order_no as x_order_no,
y.order_no as y_order_no,
y.view_yn,
x.color_cd
FROM tbl_code_item x
LEFT OUTER JOIN tbl_member_category y on x.cd_no = y.cd_no and y.member_id = #member_id#

@ -211,6 +211,7 @@
member_id,
cd_no,
order_no,
view_yn,
reg_dt
)
VALUES
@ -218,6 +219,7 @@
#member_id#,
#cd_no#,
#order_no#,
#view_yn#,
now()
);
</insert>

@ -3,96 +3,110 @@
<sqlMap namespace="com.backoffice.m.memory">
<select id="select_week" resultClass="dataMap" parameterClass="dataMap">
SELECT
DATE_FORMAT(b.reg_dt, '%Y-%m-%d') as day,
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,
(select color_cd from tbl_code_item ts where ts.val_1 = c.cd_no) as color_cd,
c.title as title,
ifnull(
CASE
when c.cd_no = 'BF_NU_TP_1' THEN
(select (blm + brm) * 0.233
from tbl_bf_daily_nutrition_1 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_2' THEN
(select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_2 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_3' THEN
(select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_3 tn1
left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_5' THEN
(select (sleep_h * 60 + sleep_m) * 0.233
from tbl_bf_daily_nutrition_5 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_6' THEN
(select 2
from tbl_bf_daily_nutrition_6 tn1
inner join tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_7' THEN
(select 2
from tbl_bf_daily_nutrition_7 tn1
inner join tbl_db_vac tv on tn1.db_dvs_no = tv.dv_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_9' THEN
(select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_9 tn1
left outer join tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_10' THEN
(select (bm * 60 + bs) * 0.233
from tbl_bf_daily_nutrition_10 tn1
left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_11' THEN
(select 2
from tbl_bf_daily_nutrition_11 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_12' THEN
(select disturb_min + disturb_sec
from tbl_bf_daily_nutrition_12 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_13' THEN
(select 2
from tbl_bf_daily_nutrition_13 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_14' THEN
(select 2
from tbl_bf_daily_nutrition_14 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_15' THEN
(select 2
from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no
)
END
, 1) AS add_degree,
count(*) as cnt
FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
WHERE
a.smc_no = #smc_no#
and b.nutirition_cd_no != ''
and b.reg_dt between STR_TO_DATE(#startDate#,'%Y-%m-%d %H:%i:%s') and ADDDATE( STR_TO_DATE(#endDate#,'%Y-%m-%d %H:%i:%s'), INTERVAL 7 DAY)
group by DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0')
order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc
XA.day,
XA.dd,
XA.hour,
XA.val_1,
XA.color_cd,
XA.title,
CASE WHEN XA.add_degree > 42.5 then 42.5
ELSE XA.add_degree
END as add_degree,
XA.cnt
FROM
(
SELECT
DATE_FORMAT(b.reg_dt, '%Y-%m-%d') as day,
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,
(select color_cd from tbl_code_item ts where ts.val_1 = c.cd_no) as color_cd,
c.title as title,
ifnull(
CASE
when c.cd_no = 'BF_NU_TP_1' THEN
(select (blm + brm) * 0.233
from tbl_bf_daily_nutrition_1 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_2' THEN
(select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_2 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_3' THEN
(select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_3 tn1
left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_5' THEN
(select (sleep_h * 60 + sleep_m) * 0.233
from tbl_bf_daily_nutrition_5 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_6' THEN
(select 2
from tbl_bf_daily_nutrition_6 tn1
inner join tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_7' THEN
(select 2
from tbl_bf_daily_nutrition_7 tn1
inner join tbl_db_vac tv on tn1.db_dvs_no = tv.dv_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_9' THEN
(select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_9 tn1
left outer join tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_10' THEN
(select (bm * 60 + bs) * 0.233
from tbl_bf_daily_nutrition_10 tn1
left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_11' THEN
(select 2
from tbl_bf_daily_nutrition_11 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_12' THEN
(select disturb_min + disturb_sec
from tbl_bf_daily_nutrition_12 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_13' THEN
(select 2
from tbl_bf_daily_nutrition_13 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_14' THEN
(select 2
from tbl_bf_daily_nutrition_14 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_15' THEN
(select 2
from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no
)
END
, 1) AS add_degree,
count(*) as cnt
FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
WHERE
a.smc_no = #smc_no#
and b.nutirition_cd_no != ''
and b.reg_dt between STR_TO_DATE(#startDate#,'%Y-%m-%d %H:%i:%s') and ADDDATE( STR_TO_DATE(#endDate#,'%Y-%m-%d %H:%i:%s'), INTERVAL 7 DAY)
group by DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0')
order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc
) XA
</select>
<select id="select_day" resultClass="dataMap" parameterClass="dataMap">

@ -207,9 +207,11 @@
<div class="swiper-container">
<div class="swiper-wrapper">
<#list model['category_list'] as item>
<div class="swiper-slide">
<#if item['view_yn'] == 'Y'>
<div class="swiper-slide">
<a href="javascript:void(0);" style="background-color:${item['color_cd']}" key="${item['val_1']!}"><span>${item['title']!}</span></a>
</div>
</div>
</#if>
</#list>
<div class="swiper-slide">
<a href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_set_record_order"><span>수정<br>설정</span></a>

@ -1,12 +1,12 @@
<script type="text/javascript" src="${URL_STATIC_ROOT}/m/m_js/native_bridge.js"></script>
<script src="${URL_STATIC_ROOT}/static/renamaster/js/cookie.js"></script>
<script>
function native_relogin(){
var cmd = 'CMD_LOGIN_SUCCESS';
var args = {
m: '${model['m']!}',
p: '${model['p']!}',
};
// window.interface.executeInterface(function(r){console.log('sussess:', r);}, function(r){console.log('fail:', r);}, cmd, args);
try {
if(getCookie("auto")) {
window.ReactNativeWebView.postMessage(JSON.stringify({action:'login', member_id: '${Session.member_id}'}));
}
} catch(e) {}
window.location.href="${URL_ROOT}/m/index.do";
}

@ -1,11 +1,9 @@
<script type="text/javascript" src="${URL_STATIC_ROOT}/m/m_js/native_bridge.js"></script>
<script>
function native_logout(){
var cmd = 'CMD_LOGOUT';
var args = {
};
// window.interface.executeInterface(function(r){console.log('sussess:', r);}, function(r){console.log('fail:', r);}, cmd, args);
try {
window.ReactNativeWebView.postMessage(JSON.stringify({action:'logout', member_id: ''}));
} catch(e) {}
window.location.href="${URL_ROOT}/m/login/view_login.do";
}

@ -42,6 +42,8 @@
</div>
<p>
<input type="checkbox" id="remember" name="remember"><label for="remember" style="padding-left:5px" class="lang">아이디 저장</label>
&nbsp;&nbsp;
<input type="checkbox" id="auto" name="auto"><label for="auto" style="padding-left:5px" class="lang">자동 로그인</label>
</p>
</div>
</form>
@ -184,6 +186,12 @@
} else {
setCookie('member_id', "", 365);
}
if($("#auto").is(":checked")) {
setCookie('auto', $('#member_id').val(), 365);
} else {
setCookie('auto', "", 365);
}
$('#frmJoin').submit();
}
}
@ -205,10 +213,15 @@
$("#remember").prop("checked", true);
// setCookie('member_id', $('#member_id').val(), 365);
}
if(getCookie("auto")) {
$("#auto").prop("checked", true);
}
<#if model['script_msg']?has_content>
setCookie('member_id', "", 365);
$("#remember").prop("checked", false);
$("#auto").prop("checked", false);
Swal.fire({
text: "${model['script_msg']}",

@ -27,6 +27,9 @@
<div class="list_item">
<a href="${URL_ROOT}/m/member_env/setting_sync.do?return_url=setting&view_nm=setting_sync" class="more_item">계정연동하기</a>
</div>
<div class="list_item">
<a href="${URL_ROOT}/m/member_env/setting_sync_cancel.do?return_url=setting&view_nm=setting_sync" class="more_item">계정연동 취소하기</a>
</div>
</div>
<h2 class="s_title">사용환경 설정</h2>

@ -0,0 +1,31 @@
<#include "/m/include/index_top.ftl">
<body class="bg_setting">
<div class="wrap">
<header class="header_wrapper">
<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=setting" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">계정 연동</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
<main class="m_set_account connect">
<div class="l_list">
<h1 class="l_title"></h1>
<h1 class="l_title">함께하는 사용자</h1>
<div class="cont_code01">
<#list model['member_list'] as item>
<div class="view_code">
${item['email']!}
</div>
<div class='btn_cont'>
<div class="btn" onclick="fncRemove(this);">연동해제</div>
</div>
</#list>
</div>
<div class="m_set_account_btn"><button type="button" onclick="location.href='${URL_ROOT}/m/bf_food/index.do'" id="" name="" class="btns blue_btn">완료</button></div>
</div>
</main>
</div>
</body>
<#include "/m/include/index_bottom.ftl">

@ -18,10 +18,49 @@
<div name="list_item" class="list_item item_order">
<label class="radio-label">${item['title']!}</label>
<input type="hidden" name="record_list" value="${item['cd_no']!}">
<div class="line-wrapper">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
<div class="side_cont">
<div class="line-wrapper">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
</div>
<div class="eye">
<input type="hidden" class="view" name="view_yn" value="${item['view_yn']!}">
<#if item['view_yn'] == 'Y'>
<img class="img-swap" src="../img/setting/open_eye.jpg" style="width: 30px; height: 30px;" alt="">
<#else>
<img class="img-swap_" src="../img/setting/close_eye.jpg" style="width: 30px; height: 30px;" alt="">
</#if>
</div>
<script>
$(function() {
$(".img-swap").click(function() {
var _class = $(this).attr('class');
if (_class == "img-swap") {
this.src = "../img/setting/close_eye.jpg";
$(this).attr('class','img-swap_');
$(this).parent().children(".view").val("N");
} else {
this.src = "../img/setting/open_eye.jpg";
$(this).attr('class','img-swap');
$(this).parent().children(".view").val("Y");
}
});
$(".img-swap_").click(function() {
var _class = $(this).attr('class');
if (_class == "img-swap") {
this.src = "../img/setting/close_eye.jpg";
$(this).attr('class','img-swap_');
$(this).parent().children(".view").val("N");
} else {
this.src = "../img/setting/open_eye.jpg";
$(this).attr('class','img-swap');
$(this).parent().children(".view").val("Y");
}
});
});
</script>
</div>
</div>
</div>
@ -67,7 +106,6 @@
return;
}.bind('this'),
success:function(result){
// console.log(result)
this.is_loading = false
var RESULT = result.RESULT;
@ -84,7 +122,7 @@
}
$(function(){
env.init()
env.init();
})
</script>

Loading…
Cancel
Save