From 9feb0f92711c426ca024ec2000e3fac15eff120b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 六月 2021 13:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml |  532 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 306 insertions(+), 226 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 bacb0f3..b1cc920
--- a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
@@ -5,257 +5,337 @@
 <mapper namespace="ownerAppUserServiceDaoImpl">
 
     <!-- 淇濆瓨缁戝畾涓氫富淇℃伅 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
-) values (
-#{idCard},#{openId},#{link},#{remark},#{operate},#{appUserName},#{communityName},#{state},#{appUserId},#{communityId},#{appTypeCd},#{bId},#{memberId}
-)
-       </insert>
+    <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,nickname,headimgurl
+        ) values (
+        #{idCard},#{openId},#{link},#{remark},#{operate},#{appUserName},#{communityName},#{state},#{appUserId},#{communityId},
+        #{appTypeCd},#{bId},#{memberId},#{userId},#{appType},#{nickName},#{headImgUrl}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ缁戝畾涓氫富淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessOwnerAppUserInfo" parameterType="Map" resultType="Map">
-           select  t.id_card,t.id_card idCard,t.open_id,t.open_id 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 
-from business_owner_app_user t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-   and t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-   and t.app_user_name= #{appUserName}
-</if> 
-<if test="communityName !=null and communityName != ''">
-   and t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="appUserId !=null and appUserId != ''">
-   and t.app_user_id= #{appUserId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-   and t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
+    <!-- 鏌ヨ缁戝畾涓氫富淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessOwnerAppUserInfo" parameterType="Map" resultType="Map">
+        select t.id_card,t.id_card idCard,t.open_id,t.open_id
+        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.nickname,t.nickname nickName,t.headimgurl,t.headimgurl headImgUrl
+        from business_owner_app_user t
+        where 1 =1
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            and t.app_user_name= #{appUserName}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            and t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨缁戝畾涓氫富淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <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
-) 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 from business_owner_app_user t where 1=1
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-   and t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-   and t.operate= 'ADD'
-<if test="appUserName !=null and appUserName != ''">
-   and t.app_user_name= #{appUserName}
-</if> 
-<if test="communityName !=null and communityName != ''">
-   and t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="appUserId !=null and appUserId != ''">
-   and t.app_user_id= #{appUserId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-   and t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
+        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,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.nickname,t.headimgurl
+        from business_owner_app_user t where 1=1
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        and t.operate= 'ADD'
+        <if test="appUserName !=null and appUserName != ''">
+            and t.app_user_name= #{appUserName}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            and t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <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="nickName !=null and nickName != ''">
+            and t.nickname= #{nickName}
+        </if>
+        <if test="headImgUrl !=null and headImgUrl != ''">
+            and t.headimgurl= #{headImgUrl}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ缁戝畾涓氫富淇℃伅 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 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 
-from owner_app_user t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-   and t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-   and t.app_user_name= #{appUserName}
-</if> 
-<if test="communityName !=null and communityName != ''">
-   and t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="appUserId !=null and appUserId != ''">
-   and t.app_user_id= #{appUserId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-   and t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        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.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,
+        bo.owner_id ownerId
+        from owner_app_user t,t_dict td1,building_owner bo
+        where 1 =1
+        and t.state = td1.status_cd
+        and td1.table_name = 'owner_app_user'
+        and td1.table_columns = 'state'
+        and t.member_id = bo.member_id
+        and t.community_id = bo.community_id
+        and bo.status_cd = '0'
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            and t.app_user_name= #{appUserName}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            and t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <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">
+                #{item}
+            </foreach>
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼缁戝畾涓氫富淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateOwnerAppUserInfoInstance" parameterType="Map">
-        update  owner_app_user t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="idCard !=null and idCard != ''">
-, t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-, t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-, t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-, t.app_user_name= #{appUserName}
-</if> 
-<if test="communityName !=null and communityName != ''">
-, t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-, t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="memberId !=null and memberId != ''">
-, t.member_id= #{memberId}
-</if> 
- where 1=1 <if test="appUserId !=null and appUserId != ''">
-and t.app_user_id= #{appUserId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update owner_app_user t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="idCard !=null and idCard != ''">
+            , t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            , t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            , t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            , t.app_user_name= #{appUserName}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            , t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            , t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            , t.member_id= #{memberId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </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 != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ缁戝畾涓氫富鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryOwnerAppUsersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from owner_app_user t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="openId !=null and openId != ''">
-   and t.open_id= #{openId}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="appUserName !=null and appUserName != ''">
-   and t.app_user_name= #{appUserName}
-</if> 
-<if test="communityName !=null and communityName != ''">
-   and t.community_name= #{communityName}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="appUserId !=null and appUserId != ''">
-   and t.app_user_id= #{appUserId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="appTypeCd !=null and appTypeCd != ''">
-   and t.app_type_cd= #{appTypeCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
+    <select id="queryOwnerAppUsersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from owner_app_user t,t_dict td1
+        where 1 =1
+        and t.state = td1.status_cd
+        and td1.table_name = 'owner_app_user'
+        and td1.table_columns = 'state'
+        and t.status_cd = '0'
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="openId !=null and openId != ''">
+            and t.open_id= #{openId}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="appUserName !=null and appUserName != ''">
+            and t.app_user_name= #{appUserName}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name= #{communityName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="appUserId !=null and appUserId != ''">
+            and t.app_user_id= #{appUserId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="appTypeCd !=null and appTypeCd != ''">
+            and t.app_type_cd= #{appTypeCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <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">
+                #{item}
+            </foreach>
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0