修改获取打卡数据接口
This commit is contained in:
@ -22,11 +22,6 @@ public class CommunityPunchReponse {
|
||||
*/
|
||||
private String openid;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
private String cusId;
|
||||
|
||||
/**
|
||||
* 昵称
|
||||
*/
|
||||
@ -43,11 +38,6 @@ public class CommunityPunchReponse {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date logTime;
|
||||
|
||||
/**
|
||||
* 当天打卡体重
|
||||
*/
|
||||
private BigDecimal weight;
|
||||
|
||||
/**
|
||||
* 营养师评论
|
||||
*/
|
||||
@ -66,10 +56,10 @@ public class CommunityPunchReponse {
|
||||
/**
|
||||
* 近期打卡体重信息 logTime: 打卡日期 weight: 体重
|
||||
*/
|
||||
private List<Map<String,Object>> recentWeight;
|
||||
private List<Map<String,Object>> weightData;
|
||||
|
||||
/**
|
||||
* 点赞的openid
|
||||
*/
|
||||
private List<Map<String,Object>> thumbsupOpenid;
|
||||
private List<Map<String,Object>> thumbsupUser;
|
||||
}
|
||||
|
@ -336,7 +336,6 @@
|
||||
<resultMap id="punchReponseMap" type="com.stdiet.custom.dto.response.CommunityPunchReponse">
|
||||
<result property="id" column="id"/>
|
||||
<result property="openid" column="openid"/>
|
||||
<result property="cusId" column="cus_id"/>
|
||||
<result property="nickName" column="nick_name"/>
|
||||
<result property="avatarUrl" column="avatar_url"/>
|
||||
<result property="logTime" column="log_time"/>
|
||||
@ -345,31 +344,33 @@
|
||||
<result property="thumbsupNum" column="thumbsup_num"/>
|
||||
<result property="healthManifesto" column="health_manifesto"/>
|
||||
<!-- 查询最近五天体重 -->
|
||||
<association property="recentWeight" column="{cusId=cus_id,logTime=log_time}" select="getRecentWeight"/>
|
||||
<association property="weightData" column="{id=openid}" select="getRecentWeight"/>
|
||||
<!-- 查询点赞的openid -->
|
||||
<association property="thumbsupOpenid" column="id" select="getPunchThumbsupList"/>
|
||||
<association property="thumbsupUser" column="id" select="getPunchThumbsupList"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 查询打卡社区内容 -->
|
||||
<select id="getCommunityPunch" resultMap="punchReponseMap" parameterType="SysWxUserLog">
|
||||
select wxlog.id,wxinfo.openid,wxinfo.cus_id,wxinfo.nick_name,wxinfo.avatar_url,wxlog.log_time,wxlog.weight,wxlog.comment,wxlog.thumbsup_num,wxlog.health_manifesto from sys_wx_user_log wxlog
|
||||
left join sys_wx_user_info wxinfo on wxinfo.openid = wxlog.openid
|
||||
where wxlog.del_flag = 0
|
||||
order by wxlog.log_time desc
|
||||
SELECT * FROM
|
||||
(SELECT id, openid, `comment`, health_manifesto, log_time FROM sys_wx_user_log WHERE TO_DAYS(log_time) = TO_DAYS(NOW()) AND del_flag = 0) AS wxlog
|
||||
LEFT JOIN (SELECT openid, nick_name, avatar_url FROM sys_wx_user_info) AS wxinfo
|
||||
USING(openid)
|
||||
ORDER BY log_time DESC
|
||||
</select>
|
||||
|
||||
<!-- 查询打卡社区中点赞的openid -->
|
||||
<select id="getPunchThumbsupList" parameterType="Long" resultType="Map">
|
||||
select cus_openid as openid from sys_punch_thumbsup
|
||||
where punch_id = #{id} and del_flag = 0
|
||||
select * from
|
||||
(select cus_openid as openid, DATE_FORMAT(create_time,'%Y-%m-%d %H:%i') as `time` from sys_punch_thumbsup where punch_id = #{id} and del_flag = 0 order by create_time asc) as tu
|
||||
left join (SELECT openid, nick_name as nickName, avatar_url as avatarUrl FROM sys_wx_user_info) AS wxinfo
|
||||
using(openid)
|
||||
</select>
|
||||
|
||||
<!-- 查询最近一周的打卡体重 -->
|
||||
<!-- 查询所有打卡体重 -->
|
||||
<select id="getRecentWeight" resultType="Map">
|
||||
select DATE_FORMAT(wxlog.log_time,'%Y-%m-%d') as logTime,wxlog.weight as weight from sys_wx_user_log wxlog
|
||||
left join sys_wx_user_info wxinfo on wxinfo.openid = wxlog.openid
|
||||
where wxlog.del_flag = 0 and wxinfo.cus_id = #{cusId} and #{logTime} >= wxlog.log_time
|
||||
order by wxlog.log_time desc limit 7
|
||||
select DATE_FORMAT(log_time,'%Y-%m-%d') as name, weight as `value` from sys_wx_user_log
|
||||
where del_flag = 0 and openid = #{id}
|
||||
order by log_time asc
|
||||
</select>
|
||||
|
||||
<!-- 根据客户ID查询总共打卡次数 -->
|
||||
|
Reference in New Issue
Block a user