From e4018d4939725d7af83f8874f889c8043b082faf Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Fri, 23 Mar 2018 15:08:57 +0800
Subject: [PATCH] update manual settle

---
 .../manage/system/web/contractController.java        |  6 +-----
 src/main/ui/static/sys/contract.js                   | 12 +++++-------
 src/main/ui/static/sys/templates/manual_settle.html  |  4 +---
 3 files changed, 7 insertions(+), 15 deletions(-)

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 14a7508e4..5d1362c3e 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
@@ -27,12 +27,8 @@ public class contractController {
         return clientContractService.list();
     }
 
-    @RequestMapping(value = "/manualSettle/list", method = RequestMethod.GET)
+    @ManagerMapping(value = "/manualSettle/list", method = RequestMethod.GET)
     public List<JSONObject> manualList() {
-        List<JSONObject> asd = manualSettleSupport.listWithClearInfo();
-        System.out.println(asd);
-        System.out.println(asd);
-        System.out.println(asd);
         return manualSettleSupport.listWithClearInfo();
     }
 }
diff --git a/src/main/ui/static/sys/contract.js b/src/main/ui/static/sys/contract.js
index 16369c0dc..f1cbcb5fd 100644
--- a/src/main/ui/static/sys/contract.js
+++ b/src/main/ui/static/sys/contract.js
@@ -15,7 +15,7 @@ define(['angular'], function (angular) {
             controller: 'settleWarningsCtrl'
         }).state('manual_settle', {
             url: '/manual_settle',
-            templateUrl: '/static/analysis/templates/manual_settle.html',
+            templateUrl: '/static/sys/templates/manual_settle.html',
             controller: 'manualSettleCtrl'
         })
     }]);
@@ -27,7 +27,6 @@ define(['angular'], function (angular) {
         };
         $scope.getContractAnalysis();
     }]);
-
     app.controller('settleWarningsCtrl', ['$scope', '$http', '$filter', 'commonDialog', function ($scope, $http, $filter, commonDialog) {
         $scope.loadWarnings = function () {
             $http.get('/manage/clearing/rate_warnings').then(function (resp) {
@@ -54,14 +53,13 @@ define(['angular'], function (angular) {
         }
     }]);
 
-
-    app.controller('manualSettleCtrl', ['$scope', '$http', function ($scope, $http) {
-        $scope.getContractAnalysis = function () {
+    app.controller('manualSettleCtrl', ['$scope', '$http', '$state', '$filter', 'commonDialog', function ($scope, $http, $state, $filter, commonDialog) {
+        $scope.getManualSettleAnalysis = function () {
             $http.get('/manage/common/analysis/manualSettle/list').then(function (resp) {
-                $scope.contract_analysis = resp.data;
+                $scope.manual_settle_analysis = resp.data;
             });
         };
-        $scope.getContractAnalysis();
+        $scope.getManualSettleAnalysis();
     }]);
 
     return app;
diff --git a/src/main/ui/static/sys/templates/manual_settle.html b/src/main/ui/static/sys/templates/manual_settle.html
index e86cb0c2c..5c81dad2c 100644
--- a/src/main/ui/static/sys/templates/manual_settle.html
+++ b/src/main/ui/static/sys/templates/manual_settle.html
@@ -20,7 +20,6 @@
                 <tr>
                     <th>Client Moniker</th>
                     <th>Unsettled</th>
-                    <th>Latest Record</th>
                     <th>Record Time</th>
                 </tr>
                 </thead>
@@ -28,8 +27,7 @@
                 <tr ng-repeat="contract in manual_settle_analysis">
                     <td ng-bind="contract.client_moniker"></td>
                     <td ng-bind="contract.unsettle"></td>
-                    <td ng-bind="contract.latest_clearing"></td>
-                    <td ng-bind="contract.latest_clearing_time|date:'dd/MMM/yyyy'"></td>
+                    <td ng-bind="contract.request_time|date:'dd/MMM/yyyy'"></td>
                 </tr>
                 </tbody>
             </table>