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

!21 修改用户列表逻辑

Browse Source 
Merge pull request !21 from 德仔/develop
This commit is contained in:
德仔 2020-12-11 17:51:13 +08:00 committed by Gitee
commit ed1e0ab156
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
View File

@ -108,7 +108,6 @@ public class SysWxUserLogController extends BaseController {
@GetMapping(value = "/wx/logs/list") @GetMapping(value = "/wx/logs/list")
public AjaxResult getLogs(SysWxUserLog sysWxUserLog) { public AjaxResult getLogs(SysWxUserLog sysWxUserLog) {
System.out.println(sysWxUserLog.toString());
List<WxLogInfo> list = sysWxUserLogService.selectWxLogInfoList(sysWxUserLog); List<WxLogInfo> list = sysWxUserLogService.selectWxLogInfoList(sysWxUserLog);
return AjaxResult.success(list); return AjaxResult.success(list);
} }

5
stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
View File

@ -36,11 +36,14 @@
</select> </select>
<select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult"> <select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
select openid, nick_name, appid, phone, avatar_url, sex from sys_wx_user_info right join sys_order using(phone) select user.openid, user.nick_name, user.appid, user.phone, user.avatar_url, user.sex, user.update_time from sys_wx_user_info user
right join sys_order
on user.phone = sys_order.phone
<where> <where>
<if test="appid != null and appid != ''">and appid = #{appid}</if> <if test="appid != null and appid != ''">and appid = #{appid}</if>
<if test="openid != null and openid != ''">and openid != #{openid}</if> <if test="openid != null and openid != ''">and openid != #{openid}</if>
</where> </where>
order by update_time desc
</select> </select>
<select id="selectSysWxUserInfoById" parameterType="String" resultMap="SysWxUserInfoResult"> <select id="selectSysWxUserInfoById" parameterType="String" resultMap="SysWxUserInfoResult">

4
stdiet-ui/src/views/custom/wxUserLog/index.vue
View File

@ -82,11 +82,11 @@
<!-- <el-table-column label="微信openid" align="center" prop="openid" />--> <!-- <el-table-column label="微信openid" align="center" prop="openid" />-->
<el-table-column label="当天体重" align="center" prop="weight"> <el-table-column label="当天体重" align="center" prop="weight">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{`${scope.row.weight} kg` }}</span> <span>{{`${scope.row.weight} 斤` }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="微信应用" align="center" prop="appid" :formatter="appidFormat"/> <el-table-column label="微信应用" align="center" prop="appid" :formatter="appidFormat"/>
<el-table-column label="手机号" align="center" prop="phone"/> <el-table-column label="手机号" align="center" prop="phone" width="180"/>
<el-table-column label="打卡日期" align="center" prop="logTime" width="180"> <el-table-column label="打卡日期" align="center" prop="logTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.logTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.logTime, '{y}-{m}-{d}') }}</span>