diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java index 1f0dd9e47..d22e270b1 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java @@ -1,5 +1,7 @@ package com.stdiet.custom.domain; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import com.stdiet.common.annotation.Excel; import com.stdiet.common.core.domain.BaseEntity; @@ -206,6 +208,8 @@ public class SysWxUserLog extends BaseEntity { //图片预览路径 private Map> imagesUrl; + private JSONArray scaleBodyData; + public void setDefecation(String defecation) { if (defecation.equals("Y") || defecation.equals("N")) { // this.defecation = defecation.equals("Y") ? "是" : "否"; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java b/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java index 5527525f9..e78d00aba 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java @@ -1,5 +1,6 @@ package com.stdiet.custom.page; +import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -125,6 +126,8 @@ public class WxLogInfo { private String healthManifesto; + private JSONArray scaleBodyData; + public void setDefecation(String defecation) { if (defecation.equals("Y") || defecation.equals("N")) { // this.defecation = defecation.equals("Y") ? "是" : "否"; diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml index 8fc4afedc..3bd622048 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml @@ -52,6 +52,7 @@ + @@ -97,6 +98,7 @@ + @@ -215,6 +217,7 @@ health_manifesto, del_flag, menstrual_period, + scale_body_data #{openid}, @@ -257,6 +260,7 @@ #{healthManifesto}, #{delFlag}, #{menstrualPeriod}, + #{scaleBodyData, jdbcType=OTHER, typeHandler=com.stdiet.custom.typehandler.ArrayJsonHandler}, @@ -300,6 +304,7 @@ health_manifesto = #{healthManifesto}, del_flag = #{delFlag}, menstrual_period = #{menstrualPeriod}, + scale_body_data = #{scaleBodyData, jdbcType=OTHER, typeHandler=com.stdiet.custom.typehandler.ArrayJsonHandler} where id = #{id} @@ -321,7 +326,7 @@ wxlog.water, wxlog.insomnia,wxlog.sport, wxlog.sport_desc,wxlog.diet, wxlog.diet_desc, wxlog.emotion, wxlog.emotion_desc,wxlog.sly_eat_food,wxlog.constipation,wxlog.ingredient_desc,wxlog.breakfast_images, wxlog.lunch_images,wxlog.dinner_images,wxlog.extra_meal_images,wxlog.body_images, wxlog.body_desc, - wxlog.remark,wxlog.execution_score,wxlog.comment, wxlog.health_manifesto, wxlog.menstrual_period + wxlog.remark,wxlog.execution_score,wxlog.comment, wxlog.health_manifesto, wxlog.menstrual_period, wxlog.scale_body_data FROM sys_wx_user_log wxlog where wxlog.del_flag = 0 and wxlog.openid = #{openid} order by wxlog.log_time asc