Skip to content

Commit 7935724

Browse files
928255095928255095
committed
完成业主功能的优化
1 parent 25dc92b commit 7935724

111 files changed

Lines changed: 696 additions & 10767 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java‎

Lines changed: 76 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@
1818
public class OwnerDto extends PageDto implements Serializable {
1919

2020
// 业主本人 1002 家庭成员
21-
public static final String OWNER_TYPE_CD_OWNER = "1001"; //业主
22-
public static final String OWNER_TYPE_CD_MEMBER = "1002"; //家庭成员
23-
public static final String OWNER_TYPE_CD_RENTING = "1003"; //租客
24-
public static final String OWNER_TYPE_CD_TEMP = "1004"; //临时人员
25-
public static final String OWNER_TYPE_CD_OTHER = "1005"; //其他
21+
public static final String OWNER_TYPE_CD_OWNER = "1001"; //户主
22+
public static final String OWNER_TYPE_CD_MEMBER = "1002"; //户员
23+
24+
public static final String PERSON_TYPE_PERSON = "P"; // 个人
25+
public static final String PERSON_TYPE_COMPANY = "C"; // 公司
26+
27+
public static final String PERSON_ROLE_OWNER = "1"; // 业主
28+
public static final String PERSON_ROLE_RENT = "2"; // 租客
29+
public static final String PERSON_ROLE_MEMBER = "3"; // 家庭成员
30+
public static final String PERSON_ROLE_STAFF = "4"; // 员工
31+
public static final String PERSON_ROLE_OTHER = "99"; // 其他
2632

2733

2834
public static final String OWNER_FLAG_TRUE = "T";//业主标识 T是真实业主 F 是虚拟业主
@@ -57,6 +63,9 @@ public class OwnerDto extends PageDto implements Serializable {
5763
private String ownerTypeCd;
5864
private String[] ownerTypeCds;
5965
private String ownerTypeName;
66+
private String personTypeName;
67+
private String personRoleName;
68+
6069
private String roomNum;
6170
private String roomName;
6271
private String psId;
@@ -93,9 +102,6 @@ public class OwnerDto extends PageDto implements Serializable {
93102

94103
private String msg;
95104

96-
private List<String> urls;
97-
98-
private String url;
99105

100106
private String roomCount;
101107
private String memberCount;
@@ -116,6 +122,12 @@ public class OwnerDto extends PageDto implements Serializable {
116122

117123
private String acctAmount;
118124

125+
private String personType;
126+
private String personRole;
127+
private String concactPerson;
128+
private String concactLink;
129+
private String faceUrl;
130+
119131

120132
public String getSex() {
121133
return sex;
@@ -439,22 +451,6 @@ public void setAddress(String address) {
439451
this.address = address;
440452
}
441453

442-
public List<String> getUrls() {
443-
return urls;
444-
}
445-
446-
public void setUrls(List<String> urls) {
447-
this.urls = urls;
448-
}
449-
450-
public String getUrl() {
451-
return url;
452-
}
453-
454-
public void setUrl(String url) {
455-
this.url = url;
456-
}
457-
458454
public String getCommunityQrCode() {
459455
return communityQrCode;
460456
}
@@ -607,4 +603,60 @@ public String getAcctAmount() {
607603
public void setAcctAmount(String acctAmount) {
608604
this.acctAmount = acctAmount;
609605
}
606+
607+
public String getPersonType() {
608+
return personType;
609+
}
610+
611+
public void setPersonType(String personType) {
612+
this.personType = personType;
613+
}
614+
615+
public String getPersonRole() {
616+
return personRole;
617+
}
618+
619+
public void setPersonRole(String personRole) {
620+
this.personRole = personRole;
621+
}
622+
623+
public String getConcactPerson() {
624+
return concactPerson;
625+
}
626+
627+
public void setConcactPerson(String concactPerson) {
628+
this.concactPerson = concactPerson;
629+
}
630+
631+
public String getConcactLink() {
632+
return concactLink;
633+
}
634+
635+
public void setConcactLink(String concactLink) {
636+
this.concactLink = concactLink;
637+
}
638+
639+
public String getFaceUrl() {
640+
return faceUrl;
641+
}
642+
643+
public void setFaceUrl(String faceUrl) {
644+
this.faceUrl = faceUrl;
645+
}
646+
647+
public String getPersonTypeName() {
648+
return personTypeName;
649+
}
650+
651+
public void setPersonTypeName(String personTypeName) {
652+
this.personTypeName = personTypeName;
653+
}
654+
655+
public String getPersonRoleName() {
656+
return personRoleName;
657+
}
658+
659+
public void setPersonRoleName(String personRoleName) {
660+
this.personRoleName = personRoleName;
661+
}
610662
}

‎java110-bean/src/main/java/com/java110/po/owner/OwnerPo.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ public class OwnerPo implements Serializable {
2929
private String bId;
3030
private String ownerFlag;
3131

32+
private String personType;
33+
private String personRole;
34+
private String concactPerson;
35+
private String concactLink;
36+
private String faceUrl;
37+
38+
3239
public String getMemberId() {
3340
return memberId;
3441
}
@@ -156,4 +163,44 @@ public String getAddress() {
156163
public void setAddress(String address) {
157164
this.address = address;
158165
}
166+
167+
public String getPersonType() {
168+
return personType;
169+
}
170+
171+
public void setPersonType(String personType) {
172+
this.personType = personType;
173+
}
174+
175+
public String getPersonRole() {
176+
return personRole;
177+
}
178+
179+
public void setPersonRole(String personRole) {
180+
this.personRole = personRole;
181+
}
182+
183+
public String getConcactPerson() {
184+
return concactPerson;
185+
}
186+
187+
public void setConcactPerson(String concactPerson) {
188+
this.concactPerson = concactPerson;
189+
}
190+
191+
public String getConcactLink() {
192+
return concactLink;
193+
}
194+
195+
public void setConcactLink(String concactLink) {
196+
this.concactLink = concactLink;
197+
}
198+
199+
public String getFaceUrl() {
200+
return faceUrl;
201+
}
202+
203+
public void setFaceUrl(String faceUrl) {
204+
this.faceUrl = faceUrl;
205+
}
159206
}

‎java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,34 +125,44 @@
125125
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
126126
t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,
127127
t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName,
128-
t.owner_flag,t.owner_flag ownerFlag,t.address
128+
t.owner_flag,t.owner_flag ownerFlag,t.address,t.person_type personType,t.person_role personRole,
129+
t.concact_person concactPerson, t.concact_link concactLink,t.face_url faceUrl,td.name ownerTypeName,
130+
tdType.name personTypeName,tdRole.name personRoleName
129131
<if test="roomIds != null">
130132
, borr.room_id roomId
131133
</if>
132-
from building_owner t,t_dict td
134+
from building_owner t
135+
left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd
136+
left join t_dict tdType on tdType.table_name = 'building_owner' and tdType.`table_columns` = 'person_type' and tdType.status_cd = t.person_type
137+
left join t_dict tdRole on tdRole.table_name = 'building_owner' and tdRole.`table_columns` = 'person_role' and tdRole.status_cd = t.person_role
133138
<if test="roomId != null and roomId != ''">
134-
,building_owner_room_rel borr
139+
left join building_owner_room_rel borr on borr.status_cd = '0' and t.owner_id = borr.owner_id
135140
</if>
136141
<if test="roomIds != null ">
137-
,building_owner_room_rel borr
142+
left join building_owner_room_rel borr on t.owner_id = borr.owner_id and borr.status_cd = t.status_cd
138143
</if>
139144
where 1 = 1
140145
<if test="roomId != null and roomId != ''">
141-
and t.owner_id = borr.owner_id
142-
and borr.status_cd = t.status_cd
143146
and borr.room_id = #{roomId}
144147
</if>
145148
<if test="roomIds != null">
146-
and t.owner_id = borr.owner_id
147-
and borr.status_cd = t.status_cd
148149
and borr.room_id in
149150
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
150151
#{item}
151152
</foreach>
152153
</if>
153-
and td.table_name = 'building_owner'
154-
and td.`table_columns` = 'owner_type_cd'
155-
and td.status_cd = t.owner_type_cd
154+
<if test="personType !=null and personType != ''">
155+
and t.person_type= #{personType}
156+
</if>
157+
<if test="personRole !=null and personRole != ''">
158+
and t.person_role= #{personRole}
159+
</if>
160+
<if test="concactPerson !=null and concactPerson != ''">
161+
and t.concact_person= #{concactPerson}
162+
</if>
163+
<if test="concactLink !=null and concactLink != ''">
164+
and t.concact_link= #{concactLink}
165+
</if>
156166
<if test="sex !=null">
157167
and t.sex= #{sex}
158168
</if>
@@ -223,21 +233,18 @@
223233
<select id="getOwnerInfoCount" parameterType="Map" resultType="Map">
224234
select count(1) count
225235
from building_owner t
236+
left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd
226237
<if test="roomId != null and roomId != ''">
227-
,building_owner_room_rel borr
238+
left join building_owner_room_rel borr on borr.status_cd = '0' and t.owner_id = borr.owner_id
228239
</if>
229240
<if test="roomIds != null ">
230-
,building_owner_room_rel borr
241+
left join building_owner_room_rel borr on t.owner_id = borr.owner_id and borr.status_cd = t.status_cd
231242
</if>
232-
where 1 =1
243+
where 1 = 1
233244
<if test="roomId != null and roomId != ''">
234-
and t.owner_id = borr.owner_id
235-
and borr.status_cd = '0'
236245
and borr.room_id = #{roomId}
237246
</if>
238247
<if test="roomIds != null">
239-
and t.owner_id = borr.owner_id
240-
and borr.status_cd = '0'
241248
and borr.room_id in
242249
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
243250
#{item}
@@ -303,6 +310,18 @@
303310
#{item}
304311
</foreach>
305312
</if>
313+
<if test="personType !=null and personType != ''">
314+
and t.person_type= #{personType}
315+
</if>
316+
<if test="personRole !=null and personRole != ''">
317+
and t.person_role= #{personRole}
318+
</if>
319+
<if test="concactPerson !=null and concactPerson != ''">
320+
and t.concact_person= #{concactPerson}
321+
</if>
322+
<if test="concactLink !=null and concactLink != ''">
323+
and t.concact_link= #{concactLink}
324+
</if>
306325
</select>
307326

308327
<!-- 修改业主信息 add by wuxw 2018-07-03 -->

0 commit comments

Comments
 (0)