From 23e5eaa3ffde198acc8dd4f91f834203cfcb9988 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 28 十一月 2019 00:48:52 +0800
Subject: [PATCH] 优化设备添加时加入位置信息
---
java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
index 1fe12a4..b18bdfd 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOwnerInfo" parameterType="Map">
insert into business_building_owner(
- operate,sex,name,link,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id
+ operate,sex,name,link,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card
) values (
- #{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId},#{ownerTypeCd},#{communityId}
+ #{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId},#{ownerTypeCd},#{communityId},#{idCard}
)
</insert>
@@ -17,7 +17,9 @@
<!-- 鏌ヨ涓氫富淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessOwnerInfo" parameterType="Map" resultType="Map">
select t.operate,t.sex,t.name,t.link,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
- t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.community_id,t.community_id communityId
+ t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
+ t.owner_type_cd ownerTypeCd,t.community_id,t.community_id communityId,
+ t.id_card, t.id_card idCard
from business_building_owner t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -41,6 +43,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -63,8 +68,9 @@
<!-- 淇濆瓨涓氫富淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveOwnerInfoInstance" parameterType="Map">
insert into building_owner(
- sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id
- ) select t.sex,t.name,t.link,'0',t.remark,t.owner_id,t.b_id,t.user_id,t.age,t.member_id,t.owner_type_cd,t.community_id communityId
+ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card
+ ) select t.sex,t.name,t.link,'0',t.remark,t.owner_id,t.b_id,t.user_id,t.age,t.member_id,t.owner_type_cd,
+ t.community_id communityId,t.id_card
from business_building_owner t where 1=1
and t.operate= 'ADD'
<if test="sex !=null">
@@ -84,6 +90,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -108,7 +117,9 @@
<select id="getOwnerInfo" parameterType="Map" resultType="Map">
select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,
t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
- t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,t.community_id communityId
+ t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
+ t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,
+ t.community_id communityId,t.id_card, t.id_card idCard
from building_owner t
where 1 =1
<if test="sex !=null">
@@ -131,6 +142,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -185,6 +199,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -237,6 +254,9 @@
<if test="age !=null and age != ''">
, t.age= #{age}
</if>
+ <if test="idCard !=null and idCard != ''">
+ , t.id_card = #{idCard}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -275,6 +295,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -325,6 +348,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -349,7 +375,9 @@
<select id="getOwnerInfoByCondition" parameterType="Map" resultType="Map">
select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
bId,
- t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.community_id,t.community_id communityId
+ t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
+ t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.community_id,
+ t.community_id communityId,t.id_card, t.id_card idCard
FROM building_owner t , s_community_member cm
WHERE t.`member_id` = cm.`member_id`
AND cm.`community_id` = #{communityId}
@@ -375,6 +403,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="idCard !=null and idCard != ''">
+ and t.id_card = #{idCard}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -425,7 +456,7 @@
SELECT t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
bId,
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd,
- r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId
+ r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card idCard
FROM building_room r,building_owner_room_rel orr,building_owner t
WHERE r.`room_id` = orr.`room_id`
AND orr.`owner_id` = t.`owner_id`
@@ -451,7 +482,8 @@
select ps.num,ps.ps_id psId,t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id
ownerId,t.b_id,t.b_id bId,
- t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd
+ t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
+ t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.id_card, t.id_card idCard
from p_parking_space ps , owner_car oc,building_owner t
where ps.ps_id = oc.ps_id
and oc.owner_id = t.owner_id
--
Gitblit v1.8.0