From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
index d11b3a9..6e61ca1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -16,7 +16,8 @@
<result column="emergencyContact" property="emergencyContact" />
<result column="emergencyContactNumber" property="emergencyContactNumber" />
<result column="isAuth" property="isAuth" />
- <result column="name" property="name" />
+ <result column="lastName" property="lastName" />
+ <result column="firstName" property="firstName" />
<result column="idCard" property="idCard" />
<result column="idCardFront" property="idCardFront" />
<result column="idCardReverse" property="idCardReverse" />
@@ -34,11 +35,12 @@
<result column="updateTime" property="updateTime" />
<result column="updateUser" property="updateUser" />
<result column="uid" property="uid"/>
+ <result column="email" property="email"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, companyId, registIp, registAreaCode, phone, nickName, avatar, birthday, sex, emergencyContact, emergencyContactNumber, isAuth, name, idCard, idCardFront, idCardReverse, consumption, balance, integral, passWord, openId, unionid, remark, state, flag, insertTime, insertUser, updateTime, updateUser,uid
+ id, companyId, registIp, registAreaCode,email, phone, nickName, avatar, birthday, sex, emergencyContact, emergencyContactNumber, isAuth, name, idCard, idCardFront, idCardReverse, consumption, balance, integral, passWord, openId, unionid, remark, state, flag, insertTime, insertUser, updateTime, updateUser,uid
</sql>
<!--根据条件查询用户列表-->
@@ -85,16 +87,18 @@
<select id="getUserDetailById" resultType="java.util.Map">
SELECT DATE_FORMAT(ui.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,ci.`name` as companyName,
case when ui.isAuth = 1 then '否' else '是' end as isAuthStr,
- IFNULL(0,0) as zcNum,
+ IFNULL(op.num,0) as zcNum,
IFNULL(ot.num,0) as czNum,
IFNULL(0,0) as kcNum,
- IFNULL(0,0) as wlNum,
+ IFNULL(ol.num,0) as wlNum,
IFNULL(td.num,0) as consumptionNum,
IFNULL(ui.balance,0) as balanceStr,
ui.* from t_user as ui
LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
+ LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_private_car where FIND_IN_SET(state,'8,9') GROUP BY userId) as op on op.userId = ui.id
LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
+ LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_logistics where FIND_IN_SET(state,'9') GROUP BY userId) as ol on ol.userId = ui.id
where ui.id = #{userId}
</select>
@@ -122,7 +126,7 @@
select
concat('user_',id) as id,
phone as phone,
- IFNULL(name,nickName) as name,
+ IFNULL(CONCAT(firstName, lastName),nickName) as name,
1 as uType,
insertTime as insertTime
from t_user
@@ -132,7 +136,7 @@
select
concat('driver_',id) as id,
phone as phone,
- name as name,
+ CONCAT(firstName, lastName) as name,
2 as uType,
insertTime as insertTime
from
--
Gitblit v1.7.1