From 9e788f0581ba4e529c752a12dad7fa9e6b057933 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Sun, 8 Apr 2018 11:13:53 +0800
Subject: [PATCH] contract add query param

---
 .../mappers/system/ClientsContractMapper.java |  2 +-
 .../system/core/ClientContractService.java    |  2 +-
 .../core/impl/ClientContractServiceImpl.java  |  4 ++--
 .../manage/system/web/contractController.java |  6 ++++--
 .../mappers/system/ClientsContractMapper.xml  |  6 +++++-
 src/main/ui/static/sys/contract.js            |  6 ++++--
 .../static/sys/templates/contract_sign.html   | 20 +++++++++++++++++--
 7 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
index b143de628..1b1f105ac 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
@@ -28,7 +28,7 @@ public interface ClientsContractMapper {
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> list();
 
-    PageList<JSONObject> listWithClientInfo(PageBounds pagination);
+    PageList<JSONObject> listWithClientInfo(JSONObject param,PageBounds pagination);
 
     List<JSONObject> analysisSingstatus();
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java
index e9ea8072c..2511eb40c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java
@@ -17,7 +17,7 @@ public interface ClientContractService {
 
     void saveContract(int client_id, Date expire_date, String channel);
 
-    JSONObject list(PageBounds pagination);
+    JSONObject list(JSONObject param,PageBounds pagination);
 
     JSONObject analysis();
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
index 5d6d6c470..40f83d625 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@@ -152,8 +152,8 @@ public class ClientContractServiceImpl implements ClientContractService {
     }
 
     @Override
-    public JSONObject list(PageBounds pagination) {
-        return PageListUtils.buildPageListResult(clientsContractMapper.listWithClientInfo(pagination));
+    public JSONObject list(JSONObject param,PageBounds pagination) {
+        return PageListUtils.buildPageListResult(clientsContractMapper.listWithClientInfo(param,pagination));
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java
index 631d910cd..61f5e931f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java
@@ -25,8 +25,10 @@ public class contractController {
     private ManualSettleSupport manualSettleSupport;
 
     @ManagerMapping(value = "/contract/list", method = RequestMethod.GET)
-    public JSONObject contractList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit) {
-        return clientContractService.list(new PageBounds(page,limit));
+    public JSONObject contractList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit,@RequestParam(required = false) String client_moniker) {
+        JSONObject params = new JSONObject();
+        params.put("client_moniker",client_moniker);
+        return clientContractService.list(params,new PageBounds(page,limit));
     }
 
     @ManagerMapping(value = "/contract", method = RequestMethod.GET)
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
index 2dc237318..3719df3ad 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
@@ -11,7 +11,11 @@
         select c.client_moniker client_moniker,cc.create_time create_time,cc.confirm_time confirm_time,a.display_name display_name from
         sys_clients_contract cc left join sys_clients c on c.client_id = cc.client_id
         left join sys_accounts a on a.account_id = cc.sign_account_id
-
+        <where>
+            <if test="client_moniker!=null">
+                c.client_moniker = #{client_moniker}
+            </if>
+        </where>
     </select>
 
     <select id="analysisSingstatus" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/src/main/ui/static/sys/contract.js b/src/main/ui/static/sys/contract.js
index a463c557d..d87aa2b99 100644
--- a/src/main/ui/static/sys/contract.js
+++ b/src/main/ui/static/sys/contract.js
@@ -19,10 +19,12 @@ define(['angular'], function (angular) {
             controller: 'manualSettleCtrl'
         })
     }]);
-    app.controller('contractAnalysisCtrl', ['$scope', '$http', '$state', '$filter', 'commonDialog', function ($scope, $http, $state, $filter, commonDialog) {
+    app.controller('contractAnalysisCtrl', ['$scope', '$http', function ($scope, $http) {
         $scope.pagination = {};
+        $scope.params = {};
         $scope.getContractAnalysis = function (page) {
-            var params = {};
+            var params = angular.copy($scope.params);
+            alert(params.client_moniker);
             params.page = page || $scope.pagination.page || 1;
             $http.get('/manage/common/analysis/contract/list', {params: params}).then(function (resp) {
                 $scope.contract = resp.data.data;
diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html
index d41656762..d94f95dd2 100644
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@@ -11,8 +11,24 @@
         <a ui-sref="manual_settle">Manual Settle</a>
     </li>
 </ul>
-<div class="modal-body">
-    <div class="box box-danger">
+<br>
+<div class="box box-danger">
+    <div class="modal-body">
+        <div class="form-inline">
+            <div class="form-group">
+                <label class="control-label" for="title-search">Partner Code</label>
+                <input class="form-control" id="title-search" ng-model="params.client_moniker">
+            </div>
+
+            <div class="form-group">
+                <button class="btn btn-primary" type="button" ng-click="getContractAnalysis(1)"><i
+                        class="fa fa-search"></i></button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="box box-danger">
+    <div class="modal-body">
         <div class="box-header">商户合同情况
             <small>（查看合同数：{{analysis.has_sign + analysis.not_sign}}，已同意：{{analysis.has_sign}})</small>
         </div>