update manual settle

master
wangning 7 years ago
parent ce1da924fd
commit e4018d4939

@ -27,12 +27,8 @@ public class contractController {
return clientContractService.list(); return clientContractService.list();
} }
@RequestMapping(value = "/manualSettle/list", method = RequestMethod.GET) @ManagerMapping(value = "/manualSettle/list", method = RequestMethod.GET)
public List<JSONObject> manualList() { public List<JSONObject> manualList() {
List<JSONObject> asd = manualSettleSupport.listWithClearInfo();
System.out.println(asd);
System.out.println(asd);
System.out.println(asd);
return manualSettleSupport.listWithClearInfo(); return manualSettleSupport.listWithClearInfo();
} }
} }

@ -15,7 +15,7 @@ define(['angular'], function (angular) {
controller: 'settleWarningsCtrl' controller: 'settleWarningsCtrl'
}).state('manual_settle', { }).state('manual_settle', {
url: '/manual_settle', url: '/manual_settle',
templateUrl: '/static/analysis/templates/manual_settle.html', templateUrl: '/static/sys/templates/manual_settle.html',
controller: 'manualSettleCtrl' controller: 'manualSettleCtrl'
}) })
}]); }]);
@ -27,7 +27,6 @@ define(['angular'], function (angular) {
}; };
$scope.getContractAnalysis(); $scope.getContractAnalysis();
}]); }]);
app.controller('settleWarningsCtrl', ['$scope', '$http', '$filter', 'commonDialog', function ($scope, $http, $filter, commonDialog) { app.controller('settleWarningsCtrl', ['$scope', '$http', '$filter', 'commonDialog', function ($scope, $http, $filter, commonDialog) {
$scope.loadWarnings = function () { $scope.loadWarnings = function () {
$http.get('/manage/clearing/rate_warnings').then(function (resp) { $http.get('/manage/clearing/rate_warnings').then(function (resp) {
@ -54,14 +53,13 @@ define(['angular'], function (angular) {
} }
}]); }]);
app.controller('manualSettleCtrl', ['$scope', '$http', '$state', '$filter', 'commonDialog', function ($scope, $http, $state, $filter, commonDialog) {
app.controller('manualSettleCtrl', ['$scope', '$http', function ($scope, $http) { $scope.getManualSettleAnalysis = function () {
$scope.getContractAnalysis = function () {
$http.get('/manage/common/analysis/manualSettle/list').then(function (resp) { $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; return app;

@ -20,7 +20,6 @@
<tr> <tr>
<th>Client Moniker</th> <th>Client Moniker</th>
<th>Unsettled</th> <th>Unsettled</th>
<th>Latest Record</th>
<th>Record Time</th> <th>Record Time</th>
</tr> </tr>
</thead> </thead>
@ -28,8 +27,7 @@
<tr ng-repeat="contract in manual_settle_analysis"> <tr ng-repeat="contract in manual_settle_analysis">
<td ng-bind="contract.client_moniker"></td> <td ng-bind="contract.client_moniker"></td>
<td ng-bind="contract.unsettle"></td> <td ng-bind="contract.unsettle"></td>
<td ng-bind="contract.latest_clearing"></td> <td ng-bind="contract.request_time|date:'dd/MMM/yyyy'"></td>
<td ng-bind="contract.latest_clearing_time|date:'dd/MMM/yyyy'"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

Loading…
Cancel
Save