查询业主信息未加入类型不准确问题

UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java

@@ -58,6 +58,7 @@ public class OwnerInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerIn
 
         Map ownerInfo = new HashMap();
         ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
+        ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
         ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
 
         List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(ownerInfo), OwnerDto.class);

WebService/src/main/java/com/java110/web/components/owner/SearchOwnerComponent.java

@@ -0,0 +1,36 @@
+package com.java110.web.components.owner;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.IOwnerServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 选择业主
+ */
+@Component("searchOwner")
+public class SearchOwnerComponent {
+    @Autowired
+    private IOwnerServiceSMO ownerServiceSMOImpl;
+
+    /**
+     * 查询小区楼信息
+     *
+     * @param pd 页面封装对象 包含页面请求数据
+     * @return ResponseEntity对象返回给页面
+     */
+    public ResponseEntity<String> listOwner(IPageData pd) {
+
+        return ownerServiceSMOImpl.listOwner(pd);
+    }
+
+
+    public IOwnerServiceSMO getOwnerServiceSMOImpl() {
+        return ownerServiceSMOImpl;
+    }
+
+    public void setOwnerServiceSMOImpl(IOwnerServiceSMO ownerServiceSMOImpl) {
+        this.ownerServiceSMOImpl = ownerServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/impl/OwnerServiceSMOImpl.java

@@ -234,7 +234,7 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
         Assert.jsonObjectHaveKey(pd.getReqData(), "memberId", "未包含业主ID");
         Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含业主ID");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
+        //Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
 
     }
 
@@ -249,7 +249,7 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含ownerId");
         Assert.jsonObjectHaveKey(pd.getReqData(), "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(pd.getReqData(), "age", "请求报文中未包含age");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
+        //Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "link", "请求报文中未包含link");
         Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "请求报文中未包含sex");
         Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区楼备注");

WebService/src/main/resources/components/list-owner-member/listOwnerMember.html

@@ -8,7 +8,7 @@
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
                         <tr>
-                            <th>业主ID</th>
+                            <th>成员ID</th>
                             <th data-hide="phone">名称</th>
                             <th data-hide="phone">性别</th>
                             <th data-hide="phone">年龄</th>

WebService/src/main/resources/components/list-owner-member/listOwnerMember.js

@@ -26,7 +26,7 @@
                     params:{
                         page:1,
                         row:15,
-                        ownerId:_param.memberId,
+                        ownerId:_param.ownerId,
                         communityId:vc.getCurrentCommunity().communityId,
                         ownerTypeCd:'1002'
                     }
@@ -37,7 +37,7 @@
                           param,
                           function(json){
                              var _memberInfo = JSON.parse(json);
-                             vc.component.memberInfo.members = _memberInfo;
+                             vc.component.memberInfo.members = _memberInfo.owners;
 
                           },function(){
                              console.log('请求失败处理');

WebService/src/main/resources/components/member-select-owner/memberSelectOwner.html

@@ -2,7 +2,7 @@
     <div class="col-lg-12">
         <div class="ibox ">
             <div class="ibox-title">
-                <h5>小区楼信息</h5>
+                <h5>业主信息</h5>
                 <div class="ibox-tools" style="top:10px;">
                     <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchOwnerModel()">
                         <i class="glyphicon glyphicon-search"></i> 选择业主</button>
@@ -29,7 +29,7 @@
                     <div class="col-sm-3">
                         <div class="form-group">
                             <label class="col-form-label" >性别：</label>
-                            <label class="">{{ownerInfo.sex == 0 ? '男' ：'女'}}</label>
+                            <label class="">{{ownerInfo.sex == 0 ? '男' : '女'}}</label>
                         </div>
                     </div>
                     <div class="col-sm-3">

WebService/src/main/resources/components/member-select-owner/memberSelectOwner.js

@@ -19,7 +19,7 @@
 
         },
         _initEvent:function(){
-            vc.on('ownerSelectOwner','chooseOwner',function(_owner){
+            vc.on('memberSelectOwner','chooseOwner',function(_owner){
                 vc.component.ownerInfo = _owner;
             });
 
@@ -29,10 +29,9 @@
             openSearchOwnerModel(){
                 vc.emit('searchOwner','openSearchOwnerModel',{});
             },
-            openAddOwnerModel(){
-                vc.emit('addOwner','addOwnerModel',{
-                    ownerId:vc.component.ownerInfo.ownerId
-                });
+            openAddMemberModel(){
+                vc.emit('addOwner','openAddOwnerModal',vc.component.ownerInfo.ownerId
+                );
             }
         }
     });

WebService/src/main/resources/components/search-owner/searchOwner.js

@@ -28,7 +28,8 @@
                         page:_page,
                         row:_row,
                         communityId:vc.getCurrentCommunity().communityId,
-                        name:_name
+                        name:_name,
+                        ownerTypeCd:'1001'
                     }
                 };
 

docs/api/owner/deleteUnit.md

@@ -0,0 +1,62 @@
+
+
+**1\. 删除小区单元信息**
+###### 接口功能
+> 用户通过web端或APP删除单元信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/unit.deleteUnit](http://api.java110.com:8008/api/unit.deleteUnit)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> GET
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|floorId|1|String|30|小区楼ID|-|
+|communityId|1|String|30|小区ID|-|
+|unitId|1|String|30|单元ID|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+成功
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/unit.deleteUnit](http://api.java110.com:8008/api/unit.deleteUnit)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+{
+    "floorId":"填写具体值",
+     "communityId":"填写具体值",
+     "unitId":"填写具体值",
+}
+
+返回报文：
+成功
+
+```

docs/api/owner/queryUnits.md

@@ -0,0 +1,76 @@
+
+
+**1\. 根据小区查询单元信息**
+###### 接口功能
+> 用户通过web端或APP查询单元信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/unit.queryUnits](http://api.java110.com:8008/api/unit.queryUnits)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> GET
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数(url部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|floorId|1|String|30|小区楼ID|-|
+|communityId|1|String|30|小区ID|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+|父参数名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|unitId|1|String|30|单元ID|-|
+|-|floorId|1|String|200|小区楼ID|-|
+|-|unitNum|1|String|12|单元编码|如 001 002|
+|-|layerCount|1|String|12|楼总层数|如 34|
+|-|lift|1|String|4|是否有电梯|如 1010 有 2020 无|
+|-|userName|1|String|50|创建者名称|如 张三 李四|
+|-|remark|?|String|200|备注|-|
+|-|createTime|1|String|30|创建时间|如：2018-04-09 12:00:34|
+
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/unit.queryUnits?floorId=12312313&communityId=7020181217000002](http://api.java110.com:8008/api/unit.queryUnits?floorId=12312313&communityId=7020181217000002)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+无
+
+返回报文：
+[{
+		"unitId": "732019042181450002",
+		"floorId": "732019042181450002",
+		"layerCount": "30",
+		"lift": "1010",
+		"unitNum": "01",
+		"remark": "填写具体值",
+		"userName": "毛彬彬",
+		"createTime": "2018-04-09 12:00:34",
+	}]
+
+```

docs/api/owner/saveOwner.md

@@ -0,0 +1,71 @@
+
+
+**1\. 保存业主信息**
+###### 接口功能
+> 用户通过web端或APP保存单元信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/unit.saveUnit](http://api.java110.com:8008/api/unit.saveUnit)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> GET
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|sex|1|String|30|-|-|
+|name|1|String|30|-|-|
+|link|1|String|30|-|-|
+|remark|1|String|30|-|-|
+|ownerId|1|String|30|-|-|
+|userId|1|String|30|-|-|
+|ownerTypeCd|1|String|4|业主类型|1001 业主 1002 家庭成员|
+|age|1|String|30|-|-|
+|memberId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+成功
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/unit.saveUnit](http://api.java110.com:8008/api/unit.saveUnit)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+{
+    "floorId":"填写具体值",
+     "layerCount":"填写具体值",
+     "unitNum":"填写具体值",
+     "lift":"填写具体值",
+     "remark":"填写具体值"
+}
+
+返回报文：
+成功
+
+```

docs/api/owner/updateUnit.md

@@ -0,0 +1,70 @@
+
+
+**1\. 修改小区单元信息**
+###### 接口功能
+> 用户通过web端或APP修改单元信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/unit.updateUnit](http://api.java110.com:8008/api/unit.updateUnit)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> GET
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|floorId|1|String|30|小区楼ID|-|
+|communityId|1|String|30|小区ID|-|
+|unitId|1|String|30|单元ID|-|
+|unitNum|1|String|12|单元编号|-|
+|layerCount|1|int|-|楼总层数|-|
+|lift|1|String|4|是否有楼梯|1010 有 2020 无|
+|layerCount|1|int|-|楼总层数|-|
+|remark|?|string|200|备注|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+成功
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/unit.updateUnit](http://api.java110.com:8008/api/unit.updateUnit)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+{
+    "floorId":"填写具体值",
+     "layerCount":"填写具体值",
+     "unitId":"填写具体值",
+     "unitNum":"填写具体值",
+     "lift":"填写具体值",
+     "remark":"填写具体值"
+}
+
+返回报文：
+成功
+
+```

docs/services/owner/SaveOwnerInfo.md

@@ -50,6 +50,7 @@
 |businessOwnerInfo|remark|1|String|30|-|-|
 |businessOwnerInfo|ownerId|1|String|30|-|-|
 |businessOwnerInfo|userId|1|String|30|-|-|
+|businessOwnerInfo|ownerTypeCd|1|String|4|业主类型|1001 业主 1002 家庭成员|
 |businessOwnerInfo|age|1|String|30|-|-|
 |businessOwnerInfo|memberId|1|String|30|-|-|
 

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

@@ -25,6 +25,7 @@ public class OwnerDto extends PageDto implements Serializable {
     private String userId;
     private String age;
     private String memberId;
+    private String ownerTypeCd;
 
     private String userName;
 
@@ -123,4 +124,12 @@ public void setMemberId(String memberId) {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public String getOwnerTypeCd() {
+        return ownerTypeCd;
+    }
+
+    public void setOwnerTypeCd(String ownerTypeCd) {
+        this.ownerTypeCd = ownerTypeCd;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ApiOwnerDataVo.java

@@ -33,6 +33,8 @@ public class ApiOwnerDataVo extends Vo {
 
     private String createTime;
 
+    private String ownerTypeCd;
+
     public String getOwnerId() {
         return ownerId;
     }
@@ -104,4 +106,12 @@ public class ApiOwnerDataVo extends Vo {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getOwnerTypeCd() {
+        return ownerTypeCd;
+    }
+
+    public void setOwnerTypeCd(String ownerTypeCd) {
+        this.ownerTypeCd = ownerTypeCd;
+    }
 }

java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml

@@ -23,7 +23,7 @@ where 1 =1
 <if test="operate !=null and operate != ''">
    and t.operate= #{operate}
 </if> 
-<if test="sex !=null and sex != ''">
+<if test="sex !=null ">
    and t.sex= #{sex}
 </if> 
 <if test="name !=null and name != ''">
@@ -67,7 +67,7 @@ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd
 ) 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
         from business_building_owner t where 1=1
    and t.operate= 'ADD'
-<if test="sex !=null and sex != ''">
+<if test="sex !=null">
    and t.sex= #{sex}
 </if> 
 <if test="name !=null and name != ''">
@@ -109,7 +109,7 @@ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd
         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
 from building_owner t 
 where 1 =1 
-<if test="sex !=null and sex != ''">
+<if test="sex !=null">
    and t.sex= #{sex}
 </if> 
 <if test="name !=null and name != ''">
@@ -163,7 +163,7 @@ where 1 =1
 <if test="newBId != null and newBId != ''">
 ,t.b_id = #{newBId}
 </if> 
-<if test="sex !=null and sex != ''">
+<if test="sex !=null ">
 , t.sex= #{sex}
 </if> 
 <if test="name !=null and name != ''">
@@ -197,7 +197,7 @@ and t.member_id= #{memberId}
      <select id="queryOwnersCount" parameterType="Map" resultType="Map">
         select  count(1) count
          FROM building_owner t
-<if test="sex !=null and sex != ''">
+<if test="sex !=null ">
    and t.sex= #{sex}
 </if> 
 <if test="name !=null and name != ''">
@@ -243,7 +243,7 @@ and t.member_id= #{memberId}
         AND cm.`community_id` = #{communityId}
         AND cm.`status_cd` = '0'
         AND t.`status_cd` = '0'
-        <if test="sex !=null and sex != ''">
+        <if test="sex !=null ">
             and t.sex= #{sex}
         </if>
         <if test="name !=null and name != ''">
@@ -290,7 +290,7 @@ and t.member_id= #{memberId}
         AND cm.`community_id` = #{communityId}
         AND cm.`status_cd` = '0'
         AND t.`status_cd` = '0'
-    <if test="sex !=null and sex != ''">
+    <if test="sex !=null ">
         and t.sex= #{sex}
     </if>
     <if test="name !=null and name != ''">