商户管理增加suburb筛选

src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java

@@ -19,6 +19,7 @@ public class PartnerQuery {
     private String searchText;
     private String client_moniker;
     private String state;
+    private String suburb;
     private String short_name;
     private String sub_merchant_id;
     private String org_id;
@@ -105,6 +106,9 @@ public class PartnerQuery {
         if (StringUtils.isNotBlank(state)) {
             param.put("state", state);
         }
+        if (StringUtils.isNotBlank(suburb)) {
+            param.put("suburb", suburb);
+        }
         if (StringUtils.isNotBlank(searchText)) {
             param.put("search_text", searchText);
             if (StringUtils.isNotBlank(textType)) {
@@ -460,4 +464,12 @@ public class PartnerQuery {
     public void setMerchant_id(String merchant_id) {
         this.merchant_id = merchant_id;
     }
+
+    public String getSuburb() {
+        return suburb;
+    }
+
+    public void setSuburb(String suburb) {
+        this.suburb = suburb;
+    }
 }

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -100,6 +100,10 @@
                 <bind name="short_name_pattern" value="'%'+short_name+'%'"/>
                 and c.short_name like #{short_name_pattern}
             </if>
+            <if test="suburb!=null">
+                <bind name="suburb_pattern" value="'%'+suburb+'%'"/>
+                and c.suburb like #{suburb_pattern}
+            </if>
             <if test="approving">
                 and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or c.open_status=1 or c.open_status=2 or c.open_status=4)
             </if>

src/main/ui/static/payment/partner/templates/partners.html

@@ -148,6 +148,16 @@
                                                 </select>
                                             </div>
                                         </div>
+
+                                        <div class="form-group col-sm-6">
+                                            <label class="control-label col-xs-4 col-sm-4" for="sub-merchant-search">
+                                                Suburb</label>
+                                            <div class="col-xs-6">
+                                                <input type="text" class="form-control" id="suburb-search"
+                                                       ng-enter="loadPartners(1)"
+                                                       ng-model="params.suburb">
+                                            </div>
+                                        </div>
                                         <!--Organization-->
                                         <div class="form-group col-sm-6" ng-if="orgs">
                                             <label class="control-label col-xs-4 col-sm-4" for="bd-select">Organization</label>