|
@@ -46,8 +46,9 @@
|
|
|
<select id="getAccountListByProject" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
select
|
|
|
t1.account_id as 'accountId',
|
|
|
- (select realname from sys_user where id = t1.user_id ) as 'userName',
|
|
|
- t1.auth_name as 'authName'
|
|
|
+ t1.user_name as 'userName',
|
|
|
+ t1.auth_name as 'authName',
|
|
|
+ t1.account_status as 'accountStatus'
|
|
|
from ctop_user_allocation t1
|
|
|
where t1.project_id = #{projectId}
|
|
|
order by t1.create_time desc
|
|
@@ -281,6 +282,21 @@
|
|
|
and t1.account_status = 0
|
|
|
order by t1.create_time desc
|
|
|
</select>
|
|
|
+ <select id="getAccountListByProjectAndUserId" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
+ select
|
|
|
+ t1.account_id as 'accountId',
|
|
|
+ t1.user_name as 'userName',
|
|
|
+ t1.auth_name as 'authName',
|
|
|
+ t1.account_status as 'accountStatus'
|
|
|
+ from ctop_user_allocation t1
|
|
|
+ where t1.project_id = #{projectId}
|
|
|
+ <if test="userId !=null and userId != '' ">
|
|
|
+ and t1.user_id = #{userId}
|
|
|
+ </if>
|
|
|
+ order by t1.create_time desc
|
|
|
+
|
|
|
+
|
|
|
+ </select>
|
|
|
<!-- 修改状态 -->
|
|
|
<update id="updCwjsSettlementStatus">
|
|
|
UPDATE ctop_cwjs_settlement_info
|