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

打卡功能优化

Browse Source
This commit is contained in:
xiezhijun
2021-04-09 19:59:54 +08:00
parent 329a7029b0
commit 1789e77786
7 changed files with 376 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@ package com.stdiet.custom.domain;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import org.springframework.web.multipart.MultipartFile;
/**
* 微信用户记录对象 sys_wx_user_log
@ -119,4 +119,14 @@ public class SysWxUserLog extends BaseEntity
/** 体型对比照 */
@Excel(name = "体型对比照")
private String bodyImages;
//售后营养师ID
private Long afterNutritionistId;
//售后营养师
@Excel(name = "售后营养师")
private String afterNutritionist;
//图片预览路径
private Map<String, List<String>> imagesUrl;
}

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

@ -37,6 +37,7 @@
<result property="customerName" column="customer_name"></result>
<!-- 营养师 -->
<result property="nutritionist" column="nutritionist"></result>
<result property="afterNutritionist" column="after_nutritionist"></result>
</resultMap>
<resultMap type="com.stdiet.custom.page.WxLogInfo" id="WxLogInfo">
@ -72,12 +73,17 @@
<!-- 后台查询 -->
<select id="selectSysWxUserLogList" parameterType="SysWxUserLog" resultMap="SysWxUserLogResult">
SELECT 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,
sc.name as customer_name, su.nick_name as nutritionist
wxlog.emotion,wxlog.sly_eat_food,wxlog.constipation,wxlog.breakfast_images,wxlog.lunch_images,wxlog.dinner_images,wxlog.extra_meal_images,wxlog.body_images,
sc.name as customer_name, su.nick_name as nutritionist, su_atferSale.nick_name as after_nutritionist
FROM sys_wx_user_log wxlog
left join sys_wx_user_info wxinfo on wxinfo.openid = wxlog.openid
left join sys_customer sc on sc.phone = wxinfo.phone and sc.del_flag = 0
left join sys_user su on su.user_id = sc.main_dietitian and su.del_flag = '0'
left join sys_user su_atferSale on su_atferSale.user_id = sc.after_dietitian and su_atferSale.del_flag = '0'
where wxinfo.phone is not null
<if test="id != null">
and wxlog.id = #{id}
</if>
<if test="phone != null and phone != ''">and (sc.name like concat('%',#{phone},'%') or wxinfo.phone like concat('%',#{phone},'%') )</if>
<if test="appid != null">
and wxinfo.appid = #{appid}
@ -85,6 +91,9 @@
<if test="nutritionistId != null">
and su.user_id = #{nutritionistId}
</if>
<if test="afterNutritionistId != null">
and su_atferSale.user_id = #{afterNutritionistId}
</if>
order by wxlog.create_time desc
</select>