Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun 2021-07-31 17:36:00 +08:00
commit 3000bbbbbe
5 changed files with 361 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserLog.java
View File

@ -1,15 +1,16 @@
package com.stdiet.custom.domain; package com.stdiet.custom.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import com.stdiet.common.utils.StringUtils;
import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
/** /**
* 微信用户记录对象 sys_wx_user_log * 微信用户记录对象 sys_wx_user_log
* *
@ -17,56 +18,91 @@ import com.stdiet.common.core.domain.BaseEntity;
* @date 2020-11-29 * @date 2020-11-29
*/ */
@Data @Data
public class SysWxUserLog extends BaseEntity public class SysWxUserLog extends BaseEntity {
{
private static final long serialVersionUID = 1L;
private Long id; private Long id;
/** 微信openid */ /**
* 微信openid
*/
private String openid; private String openid;
/** 体重 */ /**
* 体重
*/
@Excel(name = "体重") @Excel(name = "体重")
private BigDecimal weight; private BigDecimal weight;
/** 微信appid */ /**
* 微信appid
*/
@Excel(name = "微信appid") @Excel(name = "微信appid")
private String appid; private String appid;
/** 电话 */ /**
* 电话
*/
@Excel(name = "电话") @Excel(name = "电话")
private String phone; private String phone;
/** 睡觉时间 */ /**
* 睡觉时间
*/
@Excel(name = "睡觉时间") @Excel(name = "睡觉时间")
private String sleepTime; private String sleepTime;
/** 起床时间 */ /**
* 起床时间
*/
@Excel(name = "起床时间") @Excel(name = "起床时间")
private String wakeupTime; private String wakeupTime;
/** 运动情况（Y是 N否） */ /**
* 运动情况（Y是 N否）
*/
@Excel(name = "运动情况", readConverterExp = "Y=是,N=否") @Excel(name = "运动情况", readConverterExp = "Y=是,N=否")
private String sport; private String sport;
/** 用户头像 */ private String sportDesc;
/**
* 用户头像
*/
@Excel(name = "用户头像") @Excel(name = "用户头像")
private String avatarUrl; private String avatarUrl;
/** 饮食情况（Y是 N否） */ /**
* 饮食情况（Y是 N否）
*/
@Excel(name = "饮食情况", readConverterExp = "Y=是,N=否") @Excel(name = "饮食情况", readConverterExp = "Y=是,N=否")
private String diet; private String diet;
/** 熬夜失眠（Y是 N否） */ /**
* 熬夜失眠（Y是 N否）
*/
@Excel(name = "熬夜失眠", readConverterExp = "Y=是,N=否") @Excel(name = "熬夜失眠", readConverterExp = "Y=是,N=否")
private String insomnia; private String insomnia;
/** 排便情况（Y是 N否） */ /**
* 排便情况（Y是 N否）
*/
@Excel(name = "排便情况", readConverterExp = "Y=是,N=否") @Excel(name = "排便情况", readConverterExp = "Y=是,N=否")
private String defecation; private String defecation;
/** 饮水量 */ public void setDefecation(String defecation) {
if (StringUtils.isAlpha(defecation)) {
// this.defecation = defecation.equals("Y") ? "是" : "否";
this.defecation = defecation.equals("Y") ? "顺畅" : "其他";
} else {
this.defecation = defecation;
}
}
private String defecationDesc;
/**
* 饮水量
*/
@Excel(name = "饮水量") @Excel(name = "饮水量")
private Long water; private Long water;
@ -94,67 +130,101 @@ public class SysWxUserLog extends BaseEntity
@Excel(name = "营养师") @Excel(name = "营养师")
private String nutritionist; private String nutritionist;
/** 情绪 */ /**
* 情绪
*/
@Excel(name = "情绪") @Excel(name = "情绪")
private String emotion; private String emotion;
/** 食谱之外的食物 */ private String emotionDesc;
/**
* 食谱之外的食物
*/
@Excel(name = "食谱之外的食物") @Excel(name = "食谱之外的食物")
private String slyEatFood; private String slyEatFood;
/** 是否便秘（Y是 N否） */ /**
* 是否便秘（Y是 N否）
*/
@Excel(name = "是否便秘", readConverterExp = "Y=是,N=否") @Excel(name = "是否便秘", readConverterExp = "Y=是,N=否")
private String constipation; private String constipation;
/** 食材描述 */ /**
* 食材描述
*/
@Excel(name = "食材描述") @Excel(name = "食材描述")
private String ingredientDescribe; private String ingredientDesc;
/** 早餐照片 */ /**
* 早餐照片
*/
@Excel(name = "早餐照片") @Excel(name = "早餐照片")
private String breakfastImages; private String breakfastImages;
/** 午餐照片 */ /**
* 午餐照片
*/
@Excel(name = "午餐照片") @Excel(name = "午餐照片")
private String lunchImages; private String lunchImages;
/** 午餐照片 */ /**
* 午餐照片
*/
@Excel(name = "午餐照片") @Excel(name = "午餐照片")
private String dinnerImages; private String dinnerImages;
/** 加餐照片 */ /**
* 加餐照片
*/
@Excel(name = "加餐照片") @Excel(name = "加餐照片")
private String extraMealImages; private String extraMealImages;
/** 体型对比照 */ /**
* 体型对比照
*/
@Excel(name = "体型对比照") @Excel(name = "体型对比照")
private String bodyImages; private String bodyImages;
/** 服务建议 */ /**
* 服务建议
*/
@Excel(name = "服务建议") @Excel(name = "服务建议")
private String suggest; private String suggest;
/** 目标体重 */ /**
* 目标体重
*/
@Excel(name = "目标体重") @Excel(name = "目标体重")
private BigDecimal targetWeight; private BigDecimal targetWeight;
/** 执行评分，五分制 */ /**
* 执行评分，五分制
*/
@Excel(name = "执行评分，五分制") @Excel(name = "执行评分，五分制")
private BigDecimal executionScore; private BigDecimal executionScore;
/** 点评 */ /**
* 点评
*/
@Excel(name = "点评") @Excel(name = "点评")
private String comment; private String comment;
/** 点赞数量 */ /**
* 点赞数量
*/
@Excel(name = "点赞数量") @Excel(name = "点赞数量")
private Long thumbsupNum; private Long thumbsupNum;
/** 健康宣言 */ /**
* 健康宣言
*/
@Excel(name = "健康宣言") @Excel(name = "健康宣言")
private String healthManifesto; private String healthManifesto;
/** 删除标识 0未删除 1已删除 */ /**
* 删除标识 0未删除 1已删除
*/
private Long delFlag; private Long delFlag;
//售后营养师ID //售后营养师ID
@ -166,4 +236,5 @@ public class SysWxUserLog extends BaseEntity
//图片预览路径 //图片预览路径
private Map<String, List<String>> imagesUrl; private Map<String, List<String>> imagesUrl;
} }

16
stdiet-custom/src/main/java/com/stdiet/custom/page/WxLogInfo.java
View File

@ -1,6 +1,7 @@
package com.stdiet.custom.page; package com.stdiet.custom.page;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.utils.StringUtils;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -22,6 +23,8 @@ public class WxLogInfo {
private String sport; private String sport;
private String sportDesc;
private BigDecimal weight; private BigDecimal weight;
private String diet; private String diet;
@ -30,6 +33,8 @@ public class WxLogInfo {
private String defecation; private String defecation;
private String defecationDesc;
private String remark; private String remark;
/** /**
@ -37,6 +42,8 @@ public class WxLogInfo {
*/ */
private String emotion; private String emotion;
private String emotionDesc;
/** /**
* 食谱之外的食物 * 食谱之外的食物
*/ */
@ -50,7 +57,7 @@ public class WxLogInfo {
/** /**
* 食材描述 * 食材描述
*/ */
private String ingredientDescribe; private String ingredientDesc;
//全部食材照片 //全部食材照片
private String allImages; private String allImages;
@ -115,7 +122,12 @@ public class WxLogInfo {
private String healthManifesto; private String healthManifesto;
public void setDefecation(String defecation) { public void setDefecation(String defecation) {
this.defecation = defecation.equals("Y") ? "是" : "否"; if (StringUtils.isAlpha(defecation)) {
this.defecation = defecation.equals("Y") ? "是" : "否";
// this.defecation = defecation.equals("Y") ? "顺畅" : "其他";
} else {
this.defecation = defecation;
}
} }
public void setDiet(String diet) { public void setDiet(String diet) {

42
stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
View File

@ -15,10 +15,12 @@
<result property="wakeupTime" column="wakeup_time"/> <result property="wakeupTime" column="wakeup_time"/>
<result property="sleepTime" column="sleep_time"/> <result property="sleepTime" column="sleep_time"/>
<result property="sport" column="sport"/> <result property="sport" column="sport"/>
<result property="sportDesc" column="sport_desc"/>
<result property="avatarUrl" column="avatar_url"/> <result property="avatarUrl" column="avatar_url"/>
<result property="diet" column="diet"/> <result property="diet" column="diet"/>
<result property="insomnia" column="insomnia"/> <result property="insomnia" column="insomnia"/>
<result property="defecation" column="defecation"/> <result property="defecation" column="defecation"/>
<result property="defecationDesc" column="defecation_desc"/>
<result property="water" column="water"/> <result property="water" column="water"/>
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
@ -26,9 +28,10 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="emotion" column="emotion"/> <result property="emotion" column="emotion"/>
<result property="emotionDesc" column="emotion_desc"/>
<result property="slyEatFood" column="sly_eat_food"/> <result property="slyEatFood" column="sly_eat_food"/>
<result property="constipation" column="constipation"/> <result property="constipation" column="constipation"/>
<result property="ingredientDescribe" column="ingredient_describe"/> <result property="ingredientDesc" column="ingredient_desc"/>
<result property="breakfastImages" column="breakfast_images"/> <result property="breakfastImages" column="breakfast_images"/>
<result property="lunchImages" column="lunch_images"/> <result property="lunchImages" column="lunch_images"/>
<result property="dinnerImages" column="dinner_images"/> <result property="dinnerImages" column="dinner_images"/>
@ -54,16 +57,19 @@
<result property="sleepTime" column="sleep_time"/> <result property="sleepTime" column="sleep_time"/>
<result property="wakeupTime" column="wakeup_time"/> <result property="wakeupTime" column="wakeup_time"/>
<result property="sport" column="sport"/> <result property="sport" column="sport"/>
<result property="sportDesc" column="sport_desc"/>
<result property="diet" column="diet"/> <result property="diet" column="diet"/>
<result property="insomnia" column="insomnia"/> <result property="insomnia" column="insomnia"/>
<result property="defecation" column="defecation"/> <result property="defecation" column="defecation"/>
<result property="defecationDesc" column="defecation_desc"/>
<result property="water" column="water"/> <result property="water" column="water"/>
<result property="date" column="log_time"/> <result property="date" column="log_time"/>
<result property="emotion" column="emotion"/> <result property="emotion" column="emotion"/>
<result property="emotionDesc" column="emotion_desc"/>
<result property="slyEatFood" column="sly_eat_food"/> <result property="slyEatFood" column="sly_eat_food"/>
<result property="constipation" column="constipation"/> <result property="constipation" column="constipation"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="ingredientDescribe" column="ingredient_describe"/> <result property="ingredientDesc" column="ingredient_desc"/>
<!-- <result property="breakfastImages" column="breakfast_images"/>--> <!-- <result property="breakfastImages" column="breakfast_images"/>-->
<result property="breakfastImagesUrl" column="breakfast_images" typeHandler="com.stdiet.custom.typehandler.ImagesHandler"/> <result property="breakfastImagesUrl" column="breakfast_images" typeHandler="com.stdiet.custom.typehandler.ImagesHandler"/>
<!-- <result property="lunchImages" column="lunch_images"/>--> <!-- <result property="lunchImages" column="lunch_images"/>-->
@ -83,8 +89,8 @@
</resultMap> </resultMap>
<sql id="selectSysWxUserLogVo"> <sql id="selectSysWxUserLogVo">
select id,openid, weight, appid, phone, log_time, sleep_time, wakeup_time, sport, avatar_url, diet, insomnia, defecation, water, create_by, create_time, update_by, update_time, remark, select id,openid, weight, appid, phone, log_time, sleep_time, wakeup_time, sport, sport_desc, avatar_url, diet, insomnia, defecation, defecation_desc, water, create_by, create_time, update_by, update_time, remark,
emotion,sly_eat_food,constipation,ingredient_describe,breakfast_images,lunch_images,dinner_images,extra_meal_images,body_images,suggest,execution_score,comment,health_manifesto emotion, emotion_desc,sly_eat_food,constipation,ingredient_desc,breakfast_images,lunch_images,dinner_images,extra_meal_images,body_images,suggest,execution_score,comment,health_manifesto
from sys_wx_user_log from sys_wx_user_log
</sql> </sql>
@ -96,8 +102,9 @@
<select id="selectSysWxUserLogList" parameterType="SysWxUserLog" resultMap="SysWxUserLogResult"> <select id="selectSysWxUserLogList" parameterType="SysWxUserLog" resultMap="SysWxUserLogResult">
SELECT SELECT
wxlog.id,wxinfo.appid,wxinfo.openid,wxinfo.avatar_url,wxinfo.phone,wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.id,wxinfo.appid,wxinfo.openid,wxinfo.avatar_url,wxinfo.phone,wxlog.weight,wxlog.log_time,wxlog.sleep_time,
wxlog.wakeup_time,wxlog.defecation, wxlog.water, wxlog.insomnia,wxlog.sport,wxlog.diet,wxlog.remark, wxlog.wakeup_time,wxlog.defecation, wxlog.defecation_desc, wxlog.water, wxlog.insomnia,wxlog.sport, wxlog.sport_desc,wxlog.diet,wxlog.remark,
wxlog.emotion,wxlog.sly_eat_food,wxlog.constipation,wxlog.ingredient_describe,wxlog.breakfast_images,wxlog.lunch_images,wxlog.dinner_images,wxlog.extra_meal_images,wxlog.body_images, 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.suggest,wxlog.execution_score,wxlog.comment,sc.name as customer_name, su.nick_name as nutritionist, wxlog.suggest,wxlog.execution_score,wxlog.comment,sc.name as customer_name, su.nick_name as nutritionist,
su_atferSale.nick_name as after_nutritionist, wxlog.health_manifesto, wxlog.log_time su_atferSale.nick_name as after_nutritionist, wxlog.health_manifesto, wxlog.log_time
FROM sys_wx_user_log wxlog FROM sys_wx_user_log wxlog
@ -163,10 +170,12 @@
<if test="sleepTime != null">sleep_time,</if> <if test="sleepTime != null">sleep_time,</if>
<if test="wakeupTime != null">wakeup_time,</if> <if test="wakeupTime != null">wakeup_time,</if>
<if test="sport != null">sport,</if> <if test="sport != null">sport,</if>
<if test="sportDesc != null">sport_desc,</if>
<if test="avatarUrl != null">avatar_url,</if> <if test="avatarUrl != null">avatar_url,</if>
<if test="diet != null">diet,</if> <if test="diet != null">diet,</if>
<if test="insomnia != null">insomnia,</if> <if test="insomnia != null">insomnia,</if>
<if test="defecation != null">defecation,</if> <if test="defecation != null">defecation,</if>
<if test="defecationDesc != null">defecation_desc,</if>
<if test="water != null">water,</if> <if test="water != null">water,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="true">create_time,</if> <if test="true">create_time,</if>
@ -174,9 +183,10 @@
<if test="true">update_time,</if> <if test="true">update_time,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="emotion != null">emotion,</if> <if test="emotion != null">emotion,</if>
<if test="emotionDesc != null">emotion_desc,</if>
<if test="slyEatFood != null">sly_eat_food,</if> <if test="slyEatFood != null">sly_eat_food,</if>
<if test="constipation != null">constipation,</if> <if test="constipation != null">constipation,</if>
<if test="ingredientDescribe != null">ingredient_describe,</if> <if test="ingredientDesc != null">ingredient_desc,</if>
<if test="breakfastImages != null">breakfast_images,</if> <if test="breakfastImages != null">breakfast_images,</if>
<if test="lunchImages != null">lunch_images,</if> <if test="lunchImages != null">lunch_images,</if>
<if test="dinnerImages != null">dinner_images,</if> <if test="dinnerImages != null">dinner_images,</if>
@ -199,10 +209,12 @@
<if test="sleepTime != null">#{sleepTime},</if> <if test="sleepTime != null">#{sleepTime},</if>
<if test="wakeupTime != null">#{wakeupTime},</if> <if test="wakeupTime != null">#{wakeupTime},</if>
<if test="sport != null">#{sport},</if> <if test="sport != null">#{sport},</if>
<if test="sportDesc != null">#{sportDesc},</if>
<if test="avatarUrl != null">#{avatarUrl},</if> <if test="avatarUrl != null">#{avatarUrl},</if>
<if test="diet != null">#{diet},</if> <if test="diet != null">#{diet},</if>
<if test="insomnia != null">#{insomnia},</if> <if test="insomnia != null">#{insomnia},</if>
<if test="defecation != null">#{defecation},</if> <if test="defecation != null">#{defecation},</if>
<if test="defecationDesc != null">#{defecationDesc},</if>
<if test="water != null">#{water},</if> <if test="water != null">#{water},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="true">now(),</if> <if test="true">now(),</if>
@ -210,9 +222,10 @@
<if test="true">now(),</if> <if test="true">now(),</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="emotion != null">#{emotion},</if> <if test="emotion != null">#{emotion},</if>
<if test="emotionDesc != null">#{emotionDesc},</if>
<if test="slyEatFood != null">#{slyEatFood},</if> <if test="slyEatFood != null">#{slyEatFood},</if>
<if test="constipation != null">#{constipation},</if> <if test="constipation != null">#{constipation},</if>
<if test="ingredientDescribe != null">#{ingredientDescribe},</if> <if test="ingredientDesc != null">#{ingredientDesc},</if>
<if test="breakfastImages != null">#{breakfastImages},</if> <if test="breakfastImages != null">#{breakfastImages},</if>
<if test="lunchImages != null">#{lunchImages},</if> <if test="lunchImages != null">#{lunchImages},</if>
<if test="dinnerImages != null">#{dinnerImages},</if> <if test="dinnerImages != null">#{dinnerImages},</if>
@ -238,18 +251,21 @@
<if test="sleepTime != null">sleep_time = #{sleepTime},</if> <if test="sleepTime != null">sleep_time = #{sleepTime},</if>
<if test="wakeupTime != null">wakeup_time = #{wakeupTime},</if> <if test="wakeupTime != null">wakeup_time = #{wakeupTime},</if>
<if test="sport != null">sport = #{sport},</if> <if test="sport != null">sport = #{sport},</if>
<if test="sportDesc != null">sport_desc = #{sportDesc},</if>
<if test="avatarUrl != null">avatar_url = #{avatarUrl},</if> <if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
<if test="diet != null">diet = #{diet},</if> <if test="diet != null">diet = #{diet},</if>
<if test="insomnia != null">insomnia = #{insomnia},</if> <if test="insomnia != null">insomnia = #{insomnia},</if>
<if test="defecation != null">defecation = #{defecation},</if> <if test="defecation != null">defecation = #{defecation},</if>
<if test="defecationDesc != null">defecation_desc = #{defecationDesc},</if>
<if test="water != null">water = #{water},</if> <if test="water != null">water = #{water},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = now(),</if> <if test="updateTime != null">update_time = now(),</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="emotion != null">emotion = #{emotion},</if> <if test="emotion != null">emotion = #{emotion},</if>
<if test="emotionDesc != null">emotion_desc = #{emotionDesc},</if>
<if test="slyEatFood != null">sly_eat_food = #{slyEatFood},</if> <if test="slyEatFood != null">sly_eat_food = #{slyEatFood},</if>
<if test="constipation != null">constipation = #{constipation},</if> <if test="constipation != null">constipation = #{constipation},</if>
<if test="ingredientDescribe != null">ingredient_describe = #{ingredientDescribe},</if> <if test="ingredientDesc != null">ingredient_desc = #{ingredientDesc},</if>
<if test="breakfastImages != null">breakfast_images = #{breakfastImages},</if> <if test="breakfastImages != null">breakfast_images = #{breakfastImages},</if>
<if test="lunchImages != null">lunch_images = #{lunchImages},</if> <if test="lunchImages != null">lunch_images = #{lunchImages},</if>
<if test="dinnerImages != null">dinner_images = #{dinnerImages},</if> <if test="dinnerImages != null">dinner_images = #{dinnerImages},</if>
@ -279,8 +295,8 @@
<!-- 根据openid和手机号查询对应打卡记录 --> <!-- 根据openid和手机号查询对应打卡记录 -->
<select id="getWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo"> <select id="getWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
SELECT wxlog.id,wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.wakeup_time,wxlog.defecation, wxlog.water, wxlog.insomnia,wxlog.sport,wxlog.diet, SELECT wxlog.id,wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.wakeup_time,wxlog.defecation, wxlog.defecation_desc, wxlog.water, wxlog.insomnia,wxlog.sport, wxlog.sport_desc,wxlog.diet,
wxlog.emotion,wxlog.sly_eat_food,wxlog.constipation,wxlog.ingredient_describe,wxlog.breakfast_images,wxlog.lunch_images,wxlog.dinner_images,wxlog.extra_meal_images,wxlog.body_images 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.remark,wxlog.execution_score,wxlog.comment, wxlog.health_manifesto ,wxlog.remark,wxlog.execution_score,wxlog.comment, wxlog.health_manifesto
FROM sys_wx_user_log wxlog FROM sys_wx_user_log wxlog
where wxlog.del_flag = 0 and wxlog.openid = #{openid} where wxlog.del_flag = 0 and wxlog.openid = #{openid}
@ -324,8 +340,8 @@
<!-- 根据openid和手机号查询对应打卡记录 --> <!-- 根据openid和手机号查询对应打卡记录 -->
<select id="getWxLogInfoDetailById" parameterType="SysWxUserLog" resultMap="WxLogInfo"> <select id="getWxLogInfoDetailById" parameterType="SysWxUserLog" resultMap="WxLogInfo">
SELECT wxlog.id,wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.wakeup_time,wxlog.defecation, wxlog.water, wxlog.insomnia,wxlog.sport,wxlog.diet, SELECT wxlog.id,wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.wakeup_time,wxlog.defecation, wxlog.defecation_desc, wxlog.water, wxlog.insomnia,wxlog.sport, wxlog.sport_desc,wxlog.diet,
wxlog.emotion,wxlog.sly_eat_food,wxlog.constipation,wxlog.ingredient_describe,wxlog.breakfast_images,wxlog.lunch_images,wxlog.dinner_images,wxlog.extra_meal_images,wxlog.body_images 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.remark,wxlog.execution_score,wxlog.comment ,wxlog.remark,wxlog.execution_score,wxlog.comment
FROM sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid = wxlog.openid FROM sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid = wxlog.openid
where wxlog.del_flag = 0 and wxlog.id = #{id} where wxlog.del_flag = 0 and wxlog.id = #{id}

343
stdiet-ui/src/components/PunchLog/PunchLogDetail/index.vue
View File

@ -6,134 +6,155 @@
@closed="onClosed" @closed="onClosed"
:width="dialogWidth" :width="dialogWidth"
> >
<div style="margin-top: -20px;"> <div style="margin-top: -20px">
<div style="display: flex; flex-direction: row">
<div style="display: flex; flex-direction: row">
<!-- 打卡信息详情 --> <!-- 打卡信息详情 -->
<div :style="'float: left; width: '+(commentVisible ? '900px' : '950px')"> <div
<div :style="'float: left; width: ' + (commentVisible ? '900px' : '950px')"
style="float: right; margin-bottom:10px"
> >
<div style="float: right; margin-bottom: 10px">
<el-button <el-button
v-hasPermi="['custom:wxUserLog:query']" v-hasPermi="['custom:wxUserLog:query']"
type="primary" type="primary"
plain plain
@click="clickComment()" @click="clickComment()"
>打卡点评</el-button >打卡点评</el-button
> >
</div>
<h3>一、基础信息</h3>
</div> <TableDetailMessage :data="punchLogDetail"></TableDetailMessage>
<h3>一、基础信息</h3> <h3>二、食物以及对比照信息</h3>
<TableDetailMessage :data="punchLogDetail"></TableDetailMessage> <div style="height: 370px; overflow: auto">
<h3>二、食物以及对比照信息</h3> <div v-if="punchLog != null && punchLog.ingredientDesc">
<div style="height: 370px; overflow: auto"> <h4>食物描述</h4>
<!--<div v-if="punchLog != null && punchLog.ingredientDescribe != null && punchLog.ingredientDescribe != ''"> <div>
<h4>食物描述</h4> {{ punchLog.ingredientDesc }}
</div>
</div>
<div v-if="punchLog != null">
<div v-if="punchLog.imagesUrl.breakfastImages.length > 0">
<h4>早餐照片</h4>
<div> <div>
{{punchLog.ingredientDescribe}} <el-image
</div> v-for="(item, index) in punchLog.imagesUrl.breakfastImages"
</div>--> title="点击大图预览"
<div v-if="punchLog != null"> :key="'breakfast' + index"
<div v-if="punchLog.imagesUrl.breakfastImages.length > 0">
<h4>早餐照片</h4>
<div>
<el-image v-for="(item, index) in punchLog.imagesUrl.breakfastImages" title="点击大图预览" :key="'breakfast'+index"
class="food_image_first" class="food_image_first"
:src="item" :src="item"
:preview-src-list="imageUrl"> :preview-src-list="imageUrl"
</el-image> >
</div> </el-image>
</div>
<div v-if="punchLog.imagesUrl.lunchImages.length > 0">
<h4>午餐照片</h4>
<div>
<el-image v-for="(item, index) in punchLog.imagesUrl.lunchImages" title="点击大图预览" :key="'lunch'+index"
class="food_image"
:src="item"
:preview-src-list="imageUrl">
</el-image>
</div>
</div>
<div v-if="punchLog.imagesUrl.dinnerImages.length > 0">
<h4>晚餐照片</h4>
<div>
<el-image v-for="(item, index) in punchLog.imagesUrl.dinnerImages" title="点击大图预览" :key="'dinner'+index"
class="food_image"
:src="item"
:preview-src-list="imageUrl">
</el-image>
</div>
</div>
<div v-if="punchLog.imagesUrl.extraMealImages.length > 0">
<h4>加餐照片</h4>
<div>
<el-image v-for="(item, index) in punchLog.imagesUrl.extraMealImages" title="点击大图预览" :key="'extraMeal'+index"
class="food_image"
:src="item"
:preview-src-list="imageUrl">
</el-image>
</div>
</div>
<div v-if="punchLog.imagesUrl.bodyImages.length > 0">
<h4>体型对比照</h4>
<div>
<el-image v-for="(item, index) in punchLog.imagesUrl.bodyImages" title="点击大图预览" :key="index"
style="width: 300px; height: 300px"
:src="item"
:preview-src-list="imageUrl">
</el-image>
</div>
</div> </div>
</div> </div>
<div v-if="punchLog.imagesUrl.lunchImages.length > 0">
</div> <h4>午餐照片</h4>
</div> <div>
<div style="width: 200px;margin-left:40px;margin-top:50px" v-show="commentVisible"> <el-image
<h3 style="width: 200px;">{{commentTitle}}</h3> v-for="(item, index) in punchLog.imagesUrl.lunchImages"
<el-form ref="form" :model="commentForm" :rules="commentRules" label-position="top" label-width="100px" > title="点击大图预览"
<el-form-item label="打卡评分" prop="executionScore" > :key="'lunch' + index"
<el-rate class="food_image"
v-model="commentForm.executionScore" :src="item"
show-score :preview-src-list="imageUrl"
allow-half
text-color="#ff9900"
> >
</el-rate> </el-image>
</el-form-item> </div>
<el-form-item label="点评内容" prop="comment"> </div>
<el-input <div v-if="punchLog.imagesUrl.dinnerImages.length > 0">
type="textarea" <h4>晚餐照片</h4>
:rows="20" <div>
maxlength="200" <el-image
show-word-limit v-for="(item, index) in punchLog.imagesUrl.dinnerImages"
placeholder="请输入点评内容" title="点击大图预览"
v-model="commentForm.comment"> :key="'dinner' + index"
</el-input> class="food_image"
</el-form-item> :src="item"
</el-form> :preview-src-list="imageUrl"
<div slot="footer" class="dialog-footer" style="text-align:center;"> >
<el-button type="primary" @click="commentSubmit()">确 定</el-button> </el-image>
<el-button @click="commentClosed()">取 消</el-button> </div>
</div>
<div v-if="punchLog.imagesUrl.extraMealImages.length > 0">
<h4>加餐照片</h4>
<div>
<el-image
v-for="(item, index) in punchLog.imagesUrl.extraMealImages"
title="点击大图预览"
:key="'extraMeal' + index"
class="food_image"
:src="item"
:preview-src-list="imageUrl"
>
</el-image>
</div>
</div>
<div v-if="punchLog.imagesUrl.bodyImages.length > 0">
<h4>体型对比照</h4>
<div>
<el-image
v-for="(item, index) in punchLog.imagesUrl.bodyImages"
title="点击大图预览"
:key="index"
style="width: 300px; height: 300px"
:src="item"
:preview-src-list="imageUrl"
>
</el-image>
</div>
</div>
</div> </div>
</div>
</div> </div>
<div
style="width: 200px; margin-left: 40px; margin-top: 50px"
v-show="commentVisible"
>
<h3 style="width: 200px">{{ commentTitle }}</h3>
<el-form
ref="form"
:model="commentForm"
:rules="commentRules"
label-position="top"
label-width="100px"
>
<el-form-item label="打卡评分" prop="executionScore">
<el-rate
v-model="commentForm.executionScore"
show-score
allow-half
text-color="#ff9900"
>
</el-rate>
</el-form-item>
<el-form-item label="点评内容" prop="comment">
<el-input
type="textarea"
:rows="20"
maxlength="200"
show-word-limit
placeholder="请输入点评内容"
v-model="commentForm.comment"
>
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="commentSubmit()">确 定</el-button>
<el-button @click="commentClosed()">取 消</el-button>
</div>
</div> </div>
</div> </div>
</div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { getPunchLogDetail, commentPunchContent } from "@/api/custom/wxUserLog";
getPunchLogDetail,commentPunchContent
} from "@/api/custom/wxUserLog";
import TableDetailMessage from "@/components/TableDetailMessage"; import TableDetailMessage from "@/components/TableDetailMessage";
export default { export default {
name: "PunchLogDetail", name: "PunchLogDetail",
components: { components: {
TableDetailMessage TableDetailMessage,
}, },
data() { data() {
return { return {
@ -141,39 +162,36 @@ export default {
title: "", title: "",
data: null, data: null,
callback: null, callback: null,
punchLog: null, punchLog: null,
imageUrl: [], imageUrl: [],
punchLogDetail: [], punchLogDetail: [],
//打卡详情的标题，按竖显示 //打卡详情的标题，按竖显示
punchTitleData: [ punchTitleData: [
["姓名", "体重(斤)","饮水量(ml)"], ["姓名", "体重(斤)", "饮水量(ml)"],
["睡觉时间", "起床时间","运动锻炼"], ["睡觉时间", "起床时间", "运动锻炼"],
["情绪","按食谱进食","其他食物"], ["情绪", "按食谱进食", "其他食物"],
["熬夜失眠", "起床排便","是否便秘"], ["熬夜失眠", "起床排便", "是否便秘"],
["服务建议", "评分","点评内容"] ["服务建议", "评分", "点评内容"],
], ],
//打卡详情的属性名称，与标题对应，按竖显示 //打卡详情的属性名称，与标题对应，按竖显示
punchValueData: [ punchValueData: [
["customerName","weight","water"], ["customerName", "weight", "water"],
["sleepTime", "wakeupTime","sport"], ["sleepTime", "wakeupTime", "sport"],
["emotion", "diet","slyEatFood"], ["emotion", "diet", "slyEatFood"],
["insomnia","defecation", "constipation"], ["insomnia", "defecation", "constipation"],
["remark","executionScore","comment"], ["remark", "executionScore", "comment"],
], ],
commentVisible: false, commentVisible: false,
commentTitle: "", commentTitle: "",
commentForm:{ commentForm: {},
commentRules: {},
}, scoreArray: [0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5],
commentRules:{},
scoreArray:[0.5,1,1.5,2,2.5,3,3.5,4,4.5,5],
commentFlag: false, //是否更新了点评, commentFlag: false, //是否更新了点评,
dialogWidth: "1000px" dialogWidth: "1000px",
}; };
}, },
methods: { methods: {
// 自定义列背景色 // 自定义列背景色
columnStyle({ row, column, rowIndex, columnIndex }) { columnStyle({ row, column, rowIndex, columnIndex }) {
if (columnIndex % 2 === 0) { if (columnIndex % 2 === 0) {
@ -196,7 +214,7 @@ export default {
this.data = data; this.data = data;
this.callback = callback; this.callback = callback;
this.commentFlag = false; this.commentFlag = false;
this.title = `「${data.customerName}`+" "+`${data.logTime}」打卡记录`; this.title = `「${data.customerName}` + " " + `${data.logTime}」打卡记录`;
this.getPunchLogById(); this.getPunchLogById();
}, },
getPunchLogById() { getPunchLogById() {
@ -237,57 +255,58 @@ export default {
this.punchLog = null; this.punchLog = null;
this.imageUrl = []; this.imageUrl = [];
this.punchLogDetail = []; this.punchLogDetail = [];
if(this.commentFlag){ if (this.commentFlag) {
console.log("cbhdsjcsnjcsdc"); console.log("cbhdsjcsnjcsdc");
this.callback && this.callback(); this.callback && this.callback();
} }
}, },
clickComment(){ clickComment() {
//console.log(this.punchLog.executionScore); //console.log(this.punchLog.executionScore);
this.commentForm = { this.commentForm = {
id: this.punchLog.id, id: this.punchLog.id,
comment: this.punchLog.comment, comment: this.punchLog.comment,
executionScore: this.punchLog.executionScore == null ? 0 : this.punchLog.executionScore, executionScore:
} this.punchLog.executionScore == null
this.commentTitle = "点评「"+ this.punchLog.logTime +"」打卡"; ? 0
this.commentVisible = true; : this.punchLog.executionScore,
this.dialogWidth = "1200px"; };
this.commentTitle = "点评「" + this.punchLog.logTime + "」打卡";
this.commentVisible = true;
this.dialogWidth = "1200px";
}, },
commentClosed(){ commentClosed() {
this.commentVisible = false; this.commentVisible = false;
this.dialogWidth = "1000px"; this.dialogWidth = "1000px";
}, },
commentSubmit(){ commentSubmit() {
/*if(this.commentForm.executionScore == null || this.commentForm.executionScore == 0){ /*if(this.commentForm.executionScore == null || this.commentForm.executionScore == 0){
this.msgError("评分不能为0"); this.msgError("评分不能为0");
return; return;
}*/ }*/
commentPunchContent(this.commentForm).then((res) => { commentPunchContent(this.commentForm).then((res) => {
if(res.code == 200){ if (res.code == 200) {
this.msgSuccess("点评成功"); this.msgSuccess("点评成功");
this.commentClosed(); this.commentClosed();
this.getPunchLogById(); this.getPunchLogById();
this.commentFlag = true; this.commentFlag = true;
}else{ } else {
this.msgSuccess("点评失败"); this.msgSuccess("点评失败");
} }
}); });
} },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.food_image_first {
width: 280px;
height: 300px;
}
.food_image_first{ .food_image {
width: 280px; width: 280px;
height: 300px; height: 300px;
} //margin-left:10px
}
.food_image{
width: 280px;
height: 300px;
//margin-left:10px
}
</style> </style>

36
stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue
View File

@ -19,31 +19,53 @@
@onClick="handleOnClick" @onClick="handleOnClick"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="客户信息" name="2" v-if="!temId">
<div class="content">
<HealthyView
dev
showRemark
:data="healthyDataType === 0 ? healthyData : {}"
v-show="healthyDataType === 0"
/>
<BodySignView
dev
showRemark
:data="healthyDataType === 1 ? healthyData : {}"
v-show="healthyDataType === 1"
/>
</div>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script> <script>
import VueScrollTo from "vue-scrollto"; import VueScrollTo from "vue-scrollto";
import { createNamespacedHelpers } from "vuex"; import { createNamespacedHelpers } from "vuex";
const { import HealthyView from "@/components/HealthyView";
mapActions, import BodySignView from "@/components/BodySignView";
mapState, const { mapActions, mapState, mapGetters, mapMutations } =
mapGetters, createNamespacedHelpers("recipes");
mapMutations,
} = createNamespacedHelpers("recipes");
import IngredientSearchCom from "./IngredientSearchCom"; import IngredientSearchCom from "./IngredientSearchCom";
import PhysicalSignCom from "./PhysicalSignCom"; import PhysicalSignCom from "./PhysicalSignCom";
export default { export default {
name: "VerifyView", name: "VerifyView",
data() { data() {
const { temId } = this.$route.query;
return { return {
temId,
activeName: "0", activeName: "0",
selectedIgd: 0, selectedIgd: 0,
}; };
}, },
components: { IngredientSearchCom, PhysicalSignCom }, components: {
HealthyView,
BodySignView,
IngredientSearchCom,
PhysicalSignCom,
},
computed: { computed: {
...mapGetters(["verifyNotRecData"]), ...mapGetters(["verifyNotRecData"]),
...mapState(["healthyDataType", "healthyData"]),
}, },
methods: { methods: {
handleOnTabClick(tab) { handleOnTabClick(tab) {