From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 9d54cba..c443147
--- a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
@@ -7,10 +7,10 @@
<!-- 淇濆瓨缁戝畾涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOwnerAppUserInfo" parameterType="Map">
insert into business_owner_app_user(
- id_card,open_id,link,remark,operate,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,app_type
+ id_card,open_id,link,remark,operate,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,app_type,nickname,headimgurl
) values (
#{idCard},#{openId},#{link},#{remark},#{operate},#{appUserName},#{communityName},#{state},#{appUserId},#{communityId},
- #{appTypeCd},#{bId},#{memberId},#{userId},#{appType}
+ #{appTypeCd},#{bId},#{memberId},#{userId},#{appType},#{nickName},#{headImgUrl}
)
</insert>
@@ -21,7 +21,8 @@
openId,t.link,t.remark,t.operate,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,t.user_id,
- t.user_id userId,t.app_type,t.app_type appType
+ t.user_id userId,t.app_type,t.app_type appType,t.nickname,t.nickname nickName,t.headimgurl,t.headimgurl
+ headImgUrl
from business_owner_app_user t
where 1 =1
<if test="idCard !=null and idCard != ''">
@@ -74,10 +75,10 @@
<insert id="saveOwnerAppUserInfoInstance" parameterType="Map">
insert into owner_app_user(
id_card,open_id,link,remark,status_cd,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,
- app_type
+ app_type,nickname,headimgurl
) select
t.id_card,t.open_id,t.link,t.remark,'0',t.app_user_name,t.community_name,t.state,t.app_user_id,t.community_id,t.app_type_cd,t.b_id,
- t.member_id,t.user_id,t.app_type
+ t.member_id,t.user_id,t.app_type,t.nickname,t.headimgurl
from business_owner_app_user t where 1=1
<if test="idCard !=null and idCard != ''">
and t.id_card= #{idCard}
@@ -119,6 +120,12 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
+ <if test="nickName !=null and nickName != ''">
+ and t.nickname= #{nickName}
+ </if>
+ <if test="headImgUrl !=null and headImgUrl != ''">
+ and t.headimgurl= #{headImgUrl}
+ </if>
</insert>
@@ -126,15 +133,17 @@
<!-- 鏌ヨ缁戝畾涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerAppUserInfo" parameterType="Map" resultType="Map">
select t.id_card,t.id_card idCard,t.open_id,t.open_id openId,t.link,t.remark,t.status_cd,t.status_cd
- statusCd,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
+ statusCd,t.nickname,t.headimgurl,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,
- td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime
- from owner_app_user t,t_dict td1
+ td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime,
+ bo.owner_id ownerId,bo.owner_type_cd ownerTypeCd
+ from owner_app_user t
+ left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'owner_app_user' and td1.table_columns =
+ 'state'
+ left join building_owner bo on t.member_id = bo.member_id and t.community_id = bo.community_id and bo.status_cd
+ = '0'
where 1 =1
- and t.state = td1.status_cd
- and td1.table_name = 'owner_app_user'
- and td1.table_columns = 'state'
<if test="idCard !=null and idCard != ''">
and t.id_card= #{idCard}
</if>
@@ -181,18 +190,18 @@
<if test="memberId !=null and memberId != ''">
and t.member_id= #{memberId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id = #{userId}
- </if>
<if test="appType !=null and appType != ''">
and t.app_type = #{appType}
</if>
<if test="userIds !=null">
and t.user_id in
<foreach collection="userIds" open="(" close=")"
- separator="," item="item">
+ separator="," item="item">
#{item}
</foreach>
+ </if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -240,6 +249,12 @@
</if>
<if test="appType !=null and appType != ''">
, t.app_type = #{appType}
+ </if>
+ <if test="nickName !=null and nickName != ''">
+ , t.nickname= #{nickName}
+ </if>
+ <if test="headImgUrl !=null and headImgUrl != ''">
+ , t.headimgurl= #{headImgUrl}
</if>
where 1=1
<if test="appUserId !=null and appUserId != ''">
@@ -305,19 +320,19 @@
<if test="memberId !=null and memberId != ''">
and t.member_id= #{memberId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
<if test="appType !=null and appType != ''">
and t.app_type = #{appType}
</if>
<if test="userIds !=null">
and t.user_id in
<foreach collection="userIds" open="(" close=")"
- separator="," item="item">
+ separator="," item="item">
#{item}
</foreach>
</if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
</select>
--
Gitblit v1.8.0