From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml
index e634250..288221f 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml
@@ -1,26 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="ownerV1ServiceDaoImpl">
-
<!-- 淇濆瓨涓氫富淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveOwnerInfo" parameterType="Map">
- insert into building_owner(
- id_card,sex,link,owner_type_cd,remark,owner_id,user_id,name,state,community_id,age,member_id
- ) values (
- #{idCard},#{sex},#{link},#{ownerTypeCd},#{remark},#{ownerId},#{userId},#{name},#{state},#{communityId},#{age},#{memberId}
- )
+ insert into building_owner(id_card, sex, link, owner_type_cd, remark, owner_id, user_id, name, state,
+ community_id, age, member_id, address)
+ values (#{idCard}, #{sex}, #{link}, #{ownerTypeCd}, #{remark}, #{ownerId}, #{userId}, #{name}, #{state},
+ #{communityId}, #{age}, #{memberId}, #{address})
</insert>
-
<!-- 鏌ヨ涓氫富淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerInfo" parameterType="Map" resultType="Map">
select t.id_card,t.id_card idCard,t.sex,t.link,t.owner_type_cd,t.owner_type_cd
ownerTypeCd,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id
- userId,t.name,t.state,t.community_id,t.community_id communityId,t.age,t.member_id,t.member_id memberId
- from building_owner t
+ userId,t.name,t.state,t.community_id,t.community_id communityId,t.age,t.member_id,t.member_id memberId,
+ t.address from building_owner t
where 1 =1
<if test="idCard !=null and idCard != ''">
and t.id_card= #{idCard}
@@ -31,8 +27,17 @@
<if test="link !=null and link != ''">
and t.link= #{link}
</if>
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
+ </if>
+ <if test="ownerTypeCds != null">
+ and t.owner_type_cd in
+ <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -43,11 +48,20 @@
<if test="ownerId !=null and ownerId != ''">
and t.owner_id= #{ownerId}
</if>
+ <if test="ownerIds !=null">
+ and t.owner_id in
+ <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
<if test="name !=null and name != ''">
and t.name= #{name}
+ </if>
+ <if test="nameLike !=null and nameLike != ''">
+ and t.name like concat('%',#{nameLike},'%')
</if>
<if test="state !=null and state != ''">
and t.state= #{state}
@@ -65,9 +79,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼涓氫富淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateOwnerInfo" parameterType="Map">
@@ -75,14 +87,15 @@
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
- <if test="idCard !=null and idCard != ''">
- , t.id_card= #{idCard}
- </if>
+ , t.id_card= #{idCard}
<if test="sex !=null and sex != ''">
, t.sex= #{sex}
</if>
<if test="link !=null and link != ''">
, t.link= #{link}
+ </if>
+ <if test="address !=null and address != ''">
+ , t.address= #{address}
</if>
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
, t.owner_type_cd= #{ownerTypeCd}
@@ -105,14 +118,13 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
- <if test="age !=null and age != ''">
+ <if test="age != ''">
, t.age= #{age}
</if>
where 1=1
<if test="memberId !=null and memberId != ''">
and t.member_id= #{memberId}
</if>
-
</update>
<!-- 鏌ヨ涓氫富淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -129,8 +141,17 @@
<if test="link !=null and link != ''">
and t.link= #{link}
</if>
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
+ </if>
+ <if test="ownerTypeCds != null">
+ and t.owner_type_cd in
+ <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -141,11 +162,20 @@
<if test="ownerId !=null and ownerId != ''">
and t.owner_id= #{ownerId}
</if>
+ <if test="ownerIds !=null">
+ and t.owner_id in
+ <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
<if test="name !=null and name != ''">
and t.name= #{name}
+ </if>
+ <if test="nameLike !=null and nameLike != ''">
+ and t.name like concat('%',#{nameLike},'%')
</if>
<if test="state !=null and state != ''">
and t.state= #{state}
@@ -159,27 +189,36 @@
<if test="memberId !=null and memberId != ''">
and t.member_id= #{memberId}
</if>
-
-
</select>
-
-
<select id="queryOwnersBindCount" parameterType="Map" resultType="Map">
- select count(DISTINCT t.member_id) from building_owner t
- left join owner_app_user oau on t.community_id = oau.community_id and t.member_id = oau.member_id and oau.status_cd = '0'
+ select count(DISTINCT t.member_id) count from building_owner t
+ left join owner_app_user oau on t.community_id = oau.community_id and t.member_id = oau.member_id and
+ oau.status_cd = '0'
where t.status_cd = '0'
<if test='isBind == "N"'>
- and oau.member_id is null
+ and oau.member_id is null
</if>
<if test='isBind == "Y"'>
- and oau.member_id is not null
+ and oau.member_id is not null
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
-
</select>
+ <select id="queryOwnerMembersCount" parameterType="Map" resultType="Map">
+ select t.owner_id ownerId,count(1) memberCount
+ from
+ building_owner t
+ where t.status_cd = '0'
+ and t.owner_type_cd != '1001'
+ and t.owner_id in
+ <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ group by t.owner_id
+ </select>
+
+
</mapper>
--
Gitblit v1.8.0