Merge remote-tracking branch 'origin/develop_risk' into develop_risk

src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.java

@@ -26,7 +26,6 @@ public interface RiskEventMapper {
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> findAll(JSONObject params);
 
-    @AutoSql(type = SqlType.SELECT)
     PageList<JSONObject> listRisksByPage(JSONObject params, PageBounds pageBounds);
 
     @AutoSql(type = SqlType.SELECT)

src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java

@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.riskbusiness.core;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -32,6 +33,13 @@ public interface RiskBusinessService {
      */
     JSONObject getRiskEventDetail(String riskId);
 
+    /**
+     * 获取风险事件的调单信息
+     * @param orderIds
+     * @return
+     */
+    List<JSONObject> getRiskEventOrderList(String orderIds);
+
     /**
      * 新增风险事件
      * @param params
@@ -43,4 +51,10 @@ public interface RiskBusinessService {
      * @param params
      */
     void updateRiskEvent(JSONObject params);
+
+    /**
+     * 下载审核材料（zip）
+     * @param riskId
+     */
+    void downloadAuditMaterialZiP(String riskId, HttpServletResponse response);
 }

src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java

@@ -1,16 +1,28 @@
 package au.com.royalpay.payment.manage.riskbusiness.core.impl;
 
+import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
+import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.Order;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * @Author lvjian
@@ -22,6 +34,12 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
     @Autowired
     private RiskEventMapper riskEventMapper;
 
+    @Autowired
+    private OrderMapper orderMapper;
+
+    @Autowired
+    private ClientMapper clientMapper;
+
     @Override
     public List<JSONObject> getRiskEvents(JSONObject params) {
         return riskEventMapper.findAll(params);
@@ -36,7 +54,35 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
 
     @Override
     public JSONObject getRiskEventDetail(String riskId) {
-        return riskEventMapper.findById(riskId);
+        JSONObject riskEventDetail = riskEventMapper.findById(riskId);
+
+        // 获取商户信息
+        String clientMoniker = riskEventDetail.getString("client_moniker");
+        JSONObject client = clientMapper.findClientByMonikerAll(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        } else {
+            riskEventDetail.put("clientInfo", client);
+        }
+
+        return riskEventDetail;
+    }
+
+    @Override
+    public List<JSONObject> getRiskEventOrderList(String orderIds) {
+        String[] orderIdArray = orderIds.trim().split(",");
+        JSONObject query = new JSONObject();
+        List<JSONObject> tradeLogs = new ArrayList<>();
+
+        // 获取每笔订单的信息
+        for (int i = 0; i < orderIdArray.length; i++) {
+            query.put("order_id", orderIdArray[i]);
+            PageList<JSONObject> logs = orderMapper.listOrders(query, new PageBounds());
+            if (logs != null && logs.size() != 0) {
+                tradeLogs.add(logs.get(0));
+            }
+        }
+        return tradeLogs;
     }
 
     @Override
@@ -48,4 +94,33 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
     public void updateRiskEvent(JSONObject params) {
         riskEventMapper.update(params);
     }
+
+    @Override
+    public void downloadAuditMaterialZiP(String riskId, HttpServletResponse response) {
+
+        JSONObject riskEvent = riskEventMapper.findById(riskId);
+        String clientMoniker = riskEvent.getString("client_moniker");
+        try {
+            String downloadFilename = clientMoniker + "_audit_materials_" + DateFormatUtils.format(new Date(), "dd/MM/yyyy HH:mm:ss").toString() + ".zip";// 文件的名称
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
+            ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
+            String filePath = "https://file.royalpay.com.au/open/2018/09/20/1537438083143_tqIYPEDYPr40Y9Cyj4Ps1xgSRrDrVb.jpg";
+            zos.putNextEntry(new ZipEntry(filePath.substring(filePath.lastIndexOf("/"))));
+            InputStream inputStream = new URL(filePath).openConnection().getInputStream();
+            byte[] buffer = new byte[1024];
+            int result = 0;
+            while ((result = inputStream.read(buffer)) != -1) {
+                zos.write(buffer, 0, result);
+            }
+            inputStream.close();
+            zos.flush();
+            zos.close();
+
+            zos.flush();
+            zos.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java

@@ -9,10 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.DateFormat;
+import javax.servlet.http.HttpServletResponse;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,8 +31,12 @@ public class RiskBusinessController {
     }
 
     @GetMapping(value = "events/{risk_id}")
-    public JSONObject getRiskEventDetail(@PathVariable("risk_id") String riskId) {
+    public JSONObject getRiskEventDetail(@PathVariable("risk_id") String riskId,
-        return riskBusinessService.getRiskEventDetail(riskId);
+                                         @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        JSONObject riskEvent = riskBusinessService.getRiskEventDetail(riskId);
+        List<JSONObject> tradeLogs = riskBusinessService.getRiskEventOrderList(riskEvent.getString("order_ids"));
+        riskEvent.put("tradeLogs", tradeLogs);
+        return riskEvent;
     }
 
     @PostMapping(value = "events")
@@ -49,5 +50,10 @@ public class RiskBusinessController {
     public void UpdateRiskEvent(@RequestBody JSONObject params) {
         riskBusinessService.updateRiskEvent(params);
     }
+
+    @GetMapping(value = "/{risk_id}/download/materialsAsZIP")
+    public void downloadComplianceZip(@PathVariable("risk_id") String riskId, HttpServletResponse response) throws Exception {
+        riskBusinessService.downloadAuditMaterialZiP(riskId, response);
+    }
 }
 

src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper">
+    <select id="listRisksByPage" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT *
+        from risk_event
+        <where>
+            <if test="client_moniker != null">
+                AND client_moniker = #{client_moniker}
+            </if>
+            <if test="order_type != null">
+                AND order_type = #{order_type}
+            </if>
+            <if test="order_ids != null">
+                AND order_ids LIKE CONCAT('%', #{order_ids}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>

src/main/ui/static/analysis/risk_business.js

@@ -4,13 +4,28 @@
 define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
     function (angular, $) {
         'use strict';
-        var orderTypes = {
+        var orderTypesMap = {
             "1": "微信调单",
             "2": "支付宝调单",
             "3": "RoyalPay调单",
             "4": "警告",
             "5": "通用号调单"
         };
+
+        var resultTypesMap = {
+            "0": "未处理",
+            "1": "已发送邮件至BD",
+            "2": "BD已提交材料，等待审核",
+            "3": "材料审核通过",
+            "4": "材料审核不通过，已打回",
+            "5": "已处理（）",
+        };
+
+        var emailStatusMap = {
+            "0": "未发送",
+            "1": "已发送"
+        };
+
         var app = angular.module('riskBusinessApp', ['ui.router']);
         app.config(['$stateProvider', function ($stateProvider) {
             $stateProvider.state('analysis_monitoring.risk_business', {
@@ -31,13 +46,17 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 url: '/new_riskEvent',
                 templateUrl: '/static/analysis/templates/new_riskEvent.html',
                 controller: 'newRiskEventCtrl'
+            }).state('analysis_monitoring.riskEvent_detail.audit_material', {
+                url: '/audit_material',
+                templateUrl: '/static/analysis/templates/audit_material.html',
+                controller: 'auditMaterialCtrl'
             });
 
         }]);
 
         app.controller('riskBusinessCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog',
             function ($scope, $state, $http, $uibModal, commonDialog) {
-                $scope.orderTypes = orderTypes;
+                $scope.orderTypes = orderTypesMap;
                 $scope.pagination = {};
                 $scope.params = {};
 
@@ -51,18 +70,36 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 };
 
                 $scope.loadRiskEvents(1);
-
             }
         ]);
 
         app.controller('riskEventDetailCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', 'riskEvent',
             function ($scope, $state, $http, $uibModal, $filter, commonDialog, riskEvent) {
+
+                $scope.orderTypes = orderTypesMap;
+
                 $scope.riskEvent = riskEvent.data;
+
+                // 编辑表格的数据保存对象，重新从源数据复制，从而取消保存操作时不会更新视图
+                $scope.riskEventEdit = angular.copy(riskEvent.data);
+
+                // order_type转换为string类型是因为前端select控件这样才会显示初值
+                $scope.riskEventEdit.order_type += "";
+
+                // 调单信息
+                $scope.tradeLogs = $scope.riskEvent.tradeLogs;
+
+                // 商户信息
+                $scope.clientInfo = $scope.riskEvent.clientInfo;
+
+                // 控制编辑表格的显示
                 $scope.editFlag = false;
                 $scope.changeEditFlag = function(editFlag) {
                     $scope.editFlag = !editFlag;
+                    // 如果是在编辑状态，需要将日期转换为date类型（前端控件需要）
+                    // 如果是在非编辑状态，需要将日期转换为yyyy-MM-dd格式
                     if ($scope.editFlag) {
-                        $scope.riskEvent.reply_email_date = new Date($scope.riskEvent.reply_email_date.replace(/-/g, "/"));
+                        $scope.riskEventEdit.reply_email_date = new Date($scope.riskEventEdit.reply_email_date.replace(/-/g, "/"));
                     } else {
                         $scope.riskEvent.reply_email_date = $filter('date')($scope.riskEvent.reply_email_date, 'yyyy-MM-dd');
                     }
@@ -78,8 +115,9 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                         return;
                     }
 
-                    $scope.riskEvent.reply_email_date = $filter('date')($scope.riskEvent.reply_email_date, 'yyyy-MM-dd');
+                    // 保存时需要重新将日期转换为yyyy-MM-dd格式传入后端
-                    $http.put('/risk/business/events', $scope.riskEvent).then(function (resp) {
+                    $scope.riskEventEdit.reply_email_date = $filter('date')($scope.riskEventEdit.reply_email_date, 'yyyy-MM-dd');
+                    $http.put('/risk/business/events', $scope.riskEventEdit).then(function (resp) {
                         commonDialog.alert({
                             title: 'Success',
                             content: 'Update riskEvent successfully',
@@ -93,13 +131,64 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                             type: 'error'
                         });
                     });
+                };
+
+                // 关停渠道
+                $scope.updateChannel = function (orderType) {
+                    var channel;
+                    if (orderType == "1")
+                        channel = 'wechat';
+                    else if (orderType == "2")
+                        channel = 'alipay';
+                    $http.put('/sys/partners/' + $scope.riskEvent.client_moniker + '/channels/' + channel + '/permission', {allow: $scope.clientInfo['enable_' + channel]}).then(function () {
+                        $state.reload('analysis_monitoring.riskEvent_detail');
+                    }, function (resp) {
+                        commonDialog.alert({
+                            title: 'Failed to change ' + channel + ' channel permission status',
+                            content: resp.data.message,
+                            type: 'error'
+                        })
+                    });
+                };
+
+                // 关停商户
+                $scope.updateClient = function(isValid) {
+                    if (isValid) {
+                        $http.put('/sys/partners/' + $scope.riskEvent.client_moniker + '/revert').then(function () {
+                            $state.reload('analysis_monitoring.riskEvent_detail');
+                        }, function (resp) {
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                        })
+                    } else {
+                        $http.delete('/sys/partners/' + $scope.riskEvent.client_moniker).then(function () {
+                            $state.reload('analysis_monitoring.riskEvent_detail');
+                        }, function (resp) {
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                        })
+                    }
+
+                };
+
+                // 获取riskEvent详细信息
+                $scope.loadRiskEventDetail = function(riskId) {
+                    $http.get('/risk/business/events/' + riskId)
                 }
             }
         ]);
 
+        app.controller('auditMaterialCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog',
+            function ($scope, $state, $http, $uibModal, $filter, commonDialog) {
+                $scope.downloadAsZip = function () {
+                    var url = '/risk/business/' + $scope.riskEvent.risk_id + '/download/materialsAsZIP';
+                    return url;
+                };
+            }
+        ]);
+
         app.controller('newRiskEventCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog',
             function ($scope, $state, $http, $uibModal, $filter, commonDialog) {
-                $scope.orderTypes = orderTypes;
+
+                $scope.orderTypes = orderTypesMap;
 
                 $scope.save = function(form) {
                     if (form.$invalid) {
@@ -111,6 +200,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                         return;
                     }
 
+                    // 默认设置邮件回复截止日期为七天后
                     var replyDeadline = new Date();
                     replyDeadline.setDate(replyDeadline.getDate() + 7);
                     $scope.riskEvent.reply_email_date = $filter('date')(replyDeadline, 'yyyy-MM-dd');
@@ -133,5 +223,26 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
             }
         ]);
 
+        // 调单类型过滤器
+        app.filter('orderType', function() {
+            return function(type) {
+                return orderTypesMap[type];
+            }
+        });
+
+        // 处理结果过滤器
+        app.filter('resultType', function() {
+            return function(type) {
+                return resultTypesMap[type];
+            }
+        });
+
+        // 邮件发送状态过滤器
+        app.filter('emailStatus', function() {
+            return function(status) {
+                return emailStatusMap[status];
+            }
+        });
+
         return app;
     });

src/main/ui/static/analysis/templates/audit_material.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default">
+    <div class="panel-heading">Audit Files &nbsp;&nbsp;&nbsp;
+        <!--后面需要加上ng-if="file"-->
+        <a class="btn-group btn btn-success" ng-href="{{downloadAsZip()}}" target="_blank">
+            <i class="fa fa-cloud-download">一键下载</i>
+        </a>
+    </div>
+    <div class="panel-body">
+        <div class="form-horizontal">
+            <div class="form-group">
+                <label class="control-label col-sm-2">* bank statement</label>
+                <div class="col-sm-4">
+                    <div class="form-control-static">
+                    <uib-progressbar value="bankFileProgress.value" ng-if="bankFileProgress"></uib-progressbar>
+                    <a ng-if="bankIsImage" target="_blank" ng-href="{{file.client_bank_file}}">
+                        <img ng-src="{{file.client_bank_file}}" class="col-sm-8"></a>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-control-static">
+                        <p>Example：请保证图片信息清晰可见,如下图</p>
+                        <img class="col-sm-6" style="border: 1px solid #ddd"
+                             src="https://file.royalpay.com.au/open/2017/03/07/1488859920633_5ruVtDa30yY2ytBSDAAqxg0Ob2nreh.jpeg">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div style="text-align: center">
+        <a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope"  ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a>
+    </div>
+</div>
+<!--<div class="margin-bottom margin-top">-->
+<!--<button class="btn-group btn btn-success" type="button" ng-click="updateFile()">Save-->
+<!--</button>-->
+<!--</div>-->

src/main/ui/static/analysis/templates/new_riskEvent.html

@@ -12,23 +12,30 @@
                         <div class="form-horizontal">
                             <div class="form-group"
                                  ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
-                                <label class="control-label col-sm-2" for="short-id-input">* Partner Code</label>
+                                <label class="control-label col-sm-2"
+                                       for="short-id-input">* Partner Code
+                                </label>
                                 <div class="col-sm-8">
-                                    <input class="form-control text-uppercase"
+                                    <input class="form-control"
                                            ng-model="riskEvent.client_moniker"
                                            type="text"
                                            name="client_moniker"
-                                           id="short-id-input" required maxlength="6"
+                                           id="short-id-input"
+                                           required
+                                           maxlength="6"
                                            ng-pattern="/^[a-zA-Z0-9]+$/">
                                     <div ng-messages="riskEventForm.client_moniker.$error"
                                          ng-if="riskEventForm.client_moniker.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
+                                        <p class="small text-danger"
-                                            Field</p>
+                                           ng-message="required">Required Field
-                                        <p class="small text-danger" ng-message="maxlength">Less
+                                        </p>
-                                            Than 6 Letters</p>
+                                        <p class="small text-danger"
-                                        <p class="small text-danger" ng-message="pattern">Only
+                                           ng-message="maxlength">Less Than 6 Letters
-                                            Uppercase Letters and
+                                        </p>
-                                            Numbers are allowed</p>
+                                        <p class="small text-danger"
+                                           ng-message="pattern">
+                                            Only Uppercase Letters and Numbers are allowed
+                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -36,18 +43,21 @@
                             <div class="form-group"
                                  ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
                                 <label class="control-label col-sm-2"
-                                       for="order-type-input">Order Type</label>
+                                       for="order-type-input">Order Type
+                                </label>
                                 <div class="col-sm-8">
-                                    <select class="form-control" name="order_type"
+                                    <select class="form-control"
+                                            name="order_type"
                                             ng-model="riskEvent.order_type"
-                                            id="order-type-input" required
+                                            id="order-type-input"
+                                            required
                                             ng-options="key as value for (key, value) in orderTypes">
                                         <option value="">Please Choose</option>
                                     </select>
                                     <div ng-messages="riskEventForm.order_type.$error"
                                          ng-if="riskEventForm.order_type.$dirty">
-                                        <p class="small text-danger" ng-message="required">
+                                        <p class="small text-danger"
-                                            required field
+                                           ng-message="required">required field
                                         </p>
                                     </div>
                                 </div>
@@ -55,40 +65,46 @@
 
                             <div class="form-group"
                                  ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
-                                <label class="control-label col-sm-2" for="order-ids-input">Order IDs</label>
+                                <label class="control-label col-sm-2"
+                                       for="order-ids-input">Order IDs</label>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="riskEvent.order_ids" type="text"
+                                    <input class="form-control"
+                                           ng-model="riskEvent.order_ids"
+                                           type="text"
                                            name="order_ids"
                                            id="order-ids-input"
                                            required>
                                     <div ng-messages="riskEventForm.order_ids.$error"
                                          ng-if="riskEventForm.order_ids.$dirty">
-                                        <p class="small text-danger" ng-message="required">
+                                        <p class="small text-danger"
-                                            required field
+                                           ng-message="required">required field
                                         </p>
                                     </div>
                                 </div>
                             </div>
 
                             <div class="form-group">
-                                <label class="control-label col-sm-2" for="description-input">Description</label>
+                                <label class="control-label col-sm-2"
+                                       for="description-input">Description
+                                </label>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="riskEvent.description" type="text"
+                                    <input class="form-control"
+                                           ng-model="riskEvent.description"
+                                           type="text"
                                            name="description"
                                            id="description-input">
                                 </div>
                             </div>
-
                         </div>
                     </div>
                 </div>
-
             </div>
-
         </div>
 
         <div class="btn-group margin-bottom margin-top">
-            <button class="btn btn-success" type="button" ng-click="save(riskEventForm)">Save
+            <button class="btn btn-success"
+                    type="button"
+                    ng-click="save(riskEventForm)">Save
             </button>
         </div>
     </form>

src/main/ui/static/analysis/templates/riskEvent_detail.html

@@ -1,230 +1,306 @@
-<div ui-view>
+<div class="content">
+    <!--
     <section class="content-header">
         <h1>Risk Event</h1>
-    </section>
+    </section>-->
-    <div class="content">
+    <div class="row">
-        <div class="row" ng-if="!editFlag">
+        <div class="col-sm-12">
-            <div class="col-sm-12">
+            <div class="nav-tabs-custom">
-                <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs">
-                    <div class="tab-content">
+                    <li ui-sref-active-eq="active">
-                        <div class="panel panel-default">
+                        <a ui-sref="analysis_monitoring.riskEvent_detail">Risk Detail</a>
-                            <div class="panel-heading">
+                    </li>
-                                RiskEvent Basic Information
+                    <li ui-sref-active="active">
-                                <a role="button" class="pull-right"
+                        <a ui-sref=".audit_material">Audit material</a>
-                                   ng-click="changeEditFlag(editFlag)">
+                    </li>
-                                    <i class="fa fa-edit"></i> Edit
+                </ul>
-                                </a>
+                <div class="tab-content" ui-view>
-                            </div>
+                    <div class="row" ng-if="!editFlag">
-                            <div class="panel-body">
+                        <div class="col-sm-12">
-                                <div class="form-horizontal">
+                            <div class="nav-tabs-custom">
-                                    <div class="form-group">
+                                <div class="tab-content">
-                                        <label class="control-label col-sm-2">Partner Code</label>
+                                    <div class="panel panel-default">
-                                        <div class="col-sm-10">
+                                        <div class="panel-heading">
-                                            <p class="form-control-static" ng-bind="riskEvent.client_moniker"></p>
+                                            RiskEvent Basic Information
-                                        </div>
+                                            <a role="button"
-                                    </div>
+                                               class="pull-right"
-                                    <div class="form-group">
+                                               ng-click="changeEditFlag(editFlag)">
-                                        <label class="control-label col-sm-2">Order Type</label>
+                                                <i class="fa fa-edit"></i> Edit
-                                        <div class="col-sm-10">
+                                            </a>
-                                            <p class="form-control-static" ng-bind="riskEvent.order_type"></p>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-2">Result Type</label>
-                                        <div class="col-sm-10">
-                                            <p class="form-control-static" ng-bind="riskEvent.result_type"></p>
-                                        </div>
-                                    </div>
 
-                                    <div class="form-group">
+                                        <div class="panel-body">
-                                        <label class="control-label col-sm-2">Email Status</label>
+                                            <div class="form-horizontal">
-                                        <div class="col-sm-10">
+                                                <div class="form-group">
-                                            <p class="form-control-static" ng-bind="riskEvent.email_status"></p>
+                                                    <label class="control-label col-sm-2">Partner Code</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.client_moniker"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">Order IDs</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.order_ids">
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">Order Type</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.order_type | orderType">
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">Result Type</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static">
+                                                            {{riskEvent.result_type | resultType}}
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">Email Status</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.email_status | emailStatus"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">Reply Deadline</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static">
+                                                            {{riskEvent.reply_email_date | limitTo:10}}
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">Description</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.description">
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">临时关闭渠道</label>
+                                                    <div class="col-xs-6">
+                                                        <input type="checkbox"
+                                                               ng-if="riskEvent.order_type == '1'"
+                                                               ng-model="clientInfo.enable_wechat"
+                                                               bs-switch ng-change="updateChannel(riskEvent.order_type)">
+                                                        <input type="checkbox"
+                                                               ng-if="riskEvent.order_type == '2'"
+                                                               ng-model="clientInfo.enable_alipay"
+                                                               bs-switch ng-change="updateChannel(riskEvent.order_type)">
+                                                    </div>
+                                                </div>
+                                                <div class="form-group">
+                                                    <label class="control-label col-sm-2">临时关闭商户</label>
+                                                    <div class="col-xs-6">
+                                                        <input type="checkbox" ng-model="clientInfo.is_valid" bs-switch ng-change="updateClient(clientInfo.is_valid)">
+                                                    </div>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
 
-                                    <div class="form-group">
+                                    <!-- 调单信息 -->
-                                        <label class="control-label col-sm-2">Reply Deadline</label>
+                                    <div class="box">
-                                        <div class="col-sm-10">
+                                        <div class="box-header">
-                                            <p class="form-control-static">
+                                            <h3 class="box-title" style="display: inherit">
-                                                {{riskEvent.reply_email_date | limitTo:10}}
+                                                Orders Information
-                                            </p>
+                                            </h3>
                                         </div>
-                                    </div>
 
-                                    <div class="form-group">
+                                        <div class="box-body table-responsive">
-                                        <label class="control-label col-sm-2">Description</label>
+                                            <table class="table table-bordered table-hover table-striped">
-                                        <div class="col-sm-10">
+                                                <thead>
-                                            <p class="form-control-static" ng-bind="riskEvent.description"></p>
+                                                <tr>
+                                                    <th>Order ID</th>
+                                                    <th>Amount</th>
+                                                    <th>Input Amount</th>
+                                                    <th>AUD Amount</th>
+                                                    <th>Exchange Rate</th>
+                                                    <th>Status</th>
+                                                    <th>Create Time</th>
+                                                    <th>Gateway</th>
+                                                </tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr ng-repeat="trade in tradeLogs"
+                                                    ng-class="{warning:trade.clearing_status==2}">
+                                                    <td>{{trade.order_id}}</td>
+                                                    <td>{{trade.total_amount | currency: trade.currency}}</td>
+                                                    <td ng-bind="trade.display_amount | currency: trade.currency"></td>
+                                                    <td ng-bind="trade.clearing_amount | currency: 'AUD'"></td>
+                                                    <td>
+                                                <span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')"
+                                                      ng-bind="trade.exchange_rate">
+                                                </span>
+                                                        <span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span>
+                                                    </td>
+                                                    <td ng-bind="trade.status | tradeStatus"></td>
+                                                    <td ng-bind="trade.create_time"></td>
+                                                    <td ng-bind="trade.gateway | tradeGateway"></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
                                         </div>
                                     </div>
 
+                                    <a role="button"
+                                       class="btn btn-info">Send Email
+                                    </a>
                                 </div>
                             </div>
                         </div>
-                        <!-- 调单信息 -->
-                        <div class="box">
-                            <div class="box-header">
-                                <h3 class="box-title" style="display: inherit">
-                                    Orders Information
-                                </h3>
-                            </div>
-                            <div class="box-body table-responsive">
-                                <table class="table table-bordered table-hover table-striped">
-                                    <thead>
-                                    <tr>
-                                        <th>Order ID</th>
-                                        <th>Amount</th>
-                                        <th>Input Amount</th>
-                                        <th>AUD Amount</th>
-                                        <th>Exchange Rate</th>
-                                        <th>Status</th>
-                                        <th>Create Time</th>
-                                        <th>Gateway</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <tr ng-repeat="trade in tradeLogs" ng-class="{warning:trade.clearing_status==2}">
-
-                                        <td>{{trade.order_id}}</td>
-                                        <td>{{trade.total_amount|currency:trade.currency}}</td>
-                                        <td ng-bind="trade.display_amount|currency:trade.currency"></td>
-                                        <td ng-bind="trade.clearing_amount|currency:'AUD'"></td>
-                                        <td>
-                                            <span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')" ng-bind="trade.exchange_rate"></span>
-                                            <span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span>
-                                        </td>
-                                        <td ng-bind="trade.status|tradeStatus"></td>
-                                        <td ng-bind="trade.create_time"></td>
-                                        <td ng-bind="trade.gateway|tradeGateway"></td>
-                                    </tr>
-                                    </tbody>
-                                </table>
-
-                            </div>
-                        </div>
-
-                        <a role="button" class="btn btn-info">
-                            Send Email
-                        </a>
                     </div>
-                </div>
 
-            </div>
+                    <form novalidate name="riskEventForm" ng-if="editFlag">
-        </div>
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">RiskEvent Basic Information</div>
+                                    <div class="panel-body">
+                                        <div class="form-horizontal">
+                                            <div class="form-group"
+                                                 ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
+                                                <label class="control-label col-sm-2"
+                                                       for="short-id-input">* Partner Code
+                                                </label>
+                                                <div class="col-sm-8">
+                                                    <input class="form-control text-uppercase"
+                                                           ng-model="riskEventEdit.client_moniker"
+                                                           type="text"
+                                                           name="client_moniker"
+                                                           id="short-id-input"
+                                                           required
+                                                           maxlength="6"
+                                                           ng-pattern="/^[a-zA-Z0-9]+$/">
+                                                    <div ng-messages="riskEventForm.client_moniker.$error"
+                                                         ng-if="riskEventForm.client_moniker.$dirty">
+                                                        <p class="small text-danger"
+                                                           ng-message="required">Required Field
+                                                        </p>
+                                                        <p class="small text-danger"
+                                                           ng-message="maxlength">Less Than 6 Letters
+                                                        </p>
+                                                        <p class="small text-danger"
+                                                           ng-message="pattern">
+                                                            Only Uppercase Letters and Numbers are allowed
+                                                        </p>
+                                                    </div>
+                                                </div>
+                                            </div>
 
-        <form novalidate name="riskEventForm" ng-if="editFlag">
+                                            <div class="form-group"
-            <div class="row">
+                                                 ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
-                <div class="col-sm-12">
+                                                <label class="control-label col-sm-2"
-                    <div class="panel panel-default">
+                                                       for="order-type-input">Order Type
-                        <div class="panel-heading">RiskEvent Basic Information</div>
+                                                </label>
-                        <div class="panel-body">
+                                                <div class="col-sm-8">
-                            <div class="form-horizontal">
+                                                    <select class="form-control"
-                                <div class="form-group"
+                                                            name="order_type"
-                                     ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
+                                                            ng-model="riskEventEdit.order_type"
-                                    <label class="control-label col-sm-2" for="short-id-input">* Partner Code</label>
+                                                            id="order-type-input"
-                                    <div class="col-sm-8">
+                                                            required
-                                        <input class="form-control text-uppercase"
+                                                            ng-options="key as value for (key, value) in orderTypes">
-                                               ng-model="riskEvent.client_moniker"
+                                                        <option value="">Please Choose</option>
-                                               type="text"
+                                                    </select>
-                                               name="client_moniker"
-                                               id="short-id-input" required maxlength="6"
-                                               ng-pattern="/^[a-zA-Z0-9]+$/">
-                                        <div ng-messages="riskEventForm.client_moniker.$error"
-                                             ng-if="riskEventForm.client_moniker.$dirty">
-                                            <p class="small text-danger" ng-message="required">Required
-                                                Field</p>
-                                            <p class="small text-danger" ng-message="maxlength">Less
-                                                Than 6 Letters</p>
-                                            <p class="small text-danger" ng-message="pattern">Only
-                                                Uppercase Letters and
-                                                Numbers are allowed</p>
-                                        </div>
-                                    </div>
-                                </div>
 
-                                <div class="form-group"
+                                                    <div ng-messages="riskEventForm.order_type.$error"
-                                     ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
+                                                         ng-if="riskEventForm.order_type.$dirty">
-                                    <label class="control-label col-sm-2"
+                                                        <p class="small text-danger"
-                                           for="order-type-input">Order Type</label>
+                                                           ng-message="required">required field
-                                    <div class="col-sm-8">
+                                                        </p>
-                                        <select class="form-control" name="order_type"
+                                                    </div>
-                                                ng-model="riskEvent.order_type"
+                                                </div>
-                                                id="order-type-input" required
+                                            </div>
-                                                ng-options="key as value for (key, value) in orderTypes">
-                                            <option value="">Please Choose</option>
-                                        </select>
-                                        <div ng-messages="riskEventForm.order_type.$error"
-                                             ng-if="riskEventForm.order_type.$dirty">
-                                            <p class="small text-danger" ng-message="required">
-                                                required field
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div>
 
-                                <div class="form-group"
+                                            <div class="form-group"
-                                     ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
+                                                 ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
-                                    <label class="control-label col-sm-2" for="order-ids-input">Order IDs</label>
+                                                <label class="control-label col-sm-2"
-                                    <div class="col-sm-8">
+                                                       for="order-ids-input">Order IDs
-                                        <input class="form-control" ng-model="riskEvent.order_ids" type="text"
+                                                </label>
-                                               name="order_ids"
+                                                <div class="col-sm-8">
-                                               id="order-ids-input"
+                                                    <input class="form-control"
-                                               required>
+                                                           ng-model="riskEventEdit.order_ids"
-                                        <div ng-messages="riskEventForm.order_ids.$error"
+                                                           type="text"
-                                             ng-if="riskEventForm.order_ids.$dirty">
+                                                           name="order_ids"
-                                            <p class="small text-danger" ng-message="required">
+                                                           id="order-ids-input"
-                                                required field
+                                                           required>
-                                            </p>
+                                                    <div ng-messages="riskEventForm.order_ids.$error"
-                                        </div>
+                                                         ng-if="riskEventForm.order_ids.$dirty">
-                                    </div>
+                                                        <p class="small text-danger"
-                                </div>
+                                                           ng-message="required">required field
+                                                        </p>
+                                                    </div>
+                                                </div>
+                                            </div>
 
-                                <div class="form-group">
+                                            <div class="form-group">
-                                    <label class="control-label col-sm-2" for="reply-deadline-input">Reply Deadline</label>
+                                                <label class="control-label col-sm-2"
-                                    <div class="col-sm-8">
+                                                       for="reply-deadline-input">Reply Deadline
-                                        <div style="display: inline-block">
+                                                </label>
-                                            <input class="form-control" id="reply-deadline-input"
+                                                <div class="col-sm-8">
-                                                   type="text"
+                                                    <div style="display: inline-block">
-                                                   ng-model="riskEvent.reply_email_date"
+                                                        <input class="form-control"
-                                                   uib-datepicker-popup size="10" placeholder="Reply Deadline"
+                                                               id="reply-deadline-input"
-                                                   is-open="replyDeadline.open"
+                                                               type="text"
-                                                   ng-click="replyDeadline.open=true"
+                                                               ng-model="riskEventEdit.reply_email_date"
-                                                   datepicker-options="{minDate:today}">
+                                                               uib-datepicker-popup
-                                        </div>
+                                                               size="10"
-                                    </div>
+                                                               placeholder="Reply Deadline"
-                                </div>
+                                                               is-open="replyDeadline.open"
+                                                               ng-click="replyDeadline.open=true"
+                                                               datepicker-options="{minDate:today}">
+                                                    </div>
+                                                </div>
+                                            </div>
 
-                                <div class="form-group">
+                                            <div class="form-group">
-                                    <label class="control-label col-sm-2" for="description-input">Description</label>
+                                                <label class="control-label col-sm-2"
-                                    <div class="col-sm-8">
+                                                       for="description-input">Description
-                                        <input class="form-control" ng-model="riskEvent.description" type="text"
+                                                </label>
-                                               name="description"
+                                                <div class="col-sm-8">
-                                               id="description-input">
+                                                    <input class="form-control"
+                                                           ng-model="riskEventEdit.description"
+                                                           type="text"
+                                                           name="description"
+                                                           id="description-input">
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-
                             </div>
                         </div>
-                    </div>
 
+                        <div class="btn-group margin-bottom margin-top">
+                            <button class="btn btn-success"
+                                    style="margin-right: 10px;"
+                                    type="button"
+                                    ng-click="save(riskEventForm)">Save
+                            </button>
+                            <button class="btn btn-warning"
+                                    type="button"
+                                    ng-click="changeEditFlag(editFlag)">cancel
+                            </button>
+                        </div>
+                    </form>
                 </div>
-
             </div>
-
+        </div>
-            <div class="btn-group margin-bottom margin-top">
-                <button class="btn btn-success"
-                        style="margin-right: 10px;"
-                        type="button"
-                        ng-click="save(riskEventForm)">
-                    Save
-                </button>
-                <button class="btn btn-warning"
-                        type="button"
-                        ng-click="changeEditFlag(editFlag)">
-                    cancel
-                </button>
-            </div>
-        </form>
     </div>
 </div>

src/main/ui/static/analysis/templates/risk_business.html

@@ -6,17 +6,22 @@
                     <div class="box-header">
                         <div class="form-inline">
                             <div class="form-group">
-                                <label class="control-label" for="partner-code-search">Partner Code</label>
+                                <label class="control-label"
-                                <input type="text" class="form-control" id="partner-code-search"
+                                       for="partner-code-search">Partner Code
-                                       ng-model="params.client_moniker">
+                                </label>
+                                <input type="text"
+                                       class="form-control"
+                                       id="partner-code-search"
+                                       ng-model="params.clientMoniker">
                             </div>
 
                             <div class="form-group">
-                                <label class="control-label" for="order-type-input">
+                                <label class="control-label"
-                                    Order Type
+                                       for="order-type-input">Order Type
                                 </label>
-                                <select class="form-control" name="order_type"
+                                <select class="form-control"
-                                        ng-model="params.order_type"
+                                        name="order_type"
+                                        ng-model="params.orderType"
                                         id="order-type-input"
                                         ng-options="key as value for (key, value) in orderTypes">
                                     <option value="">ALL</option>
@@ -24,28 +29,34 @@
                             </div>
 
                             <div class="form-group">
-                                <button class="btn btn-primary" type="button" ng-click="loadRiskEvents(1)"><i
+                                <label class="control-label"
-                                        class="fa fa-search"></i></button>
+                                       for="order-ids-input">Order IDs
+                                </label>
+                                <input class="form-control"
+                                       ng-model="params.orderIds"
+                                       type="text"
+                                       name="order_ids"
+                                       id="order-ids-input">
                             </div>
 
                             <div class="form-group">
-                                <label class="control-label col-sm-2" for="order-ids-input">Order IDs</label>
+                                <button class="btn btn-primary"
-                                <div class="col-sm-8">
+                                        type="button"
-                                    <input class="form-control" ng-model="params.order_ids" type="text"
+                                        ng-click="loadRiskEvents(1)">
-                                           name="order_ids"
+                                    <i class="fa fa-search"></i>
-                                           id="order-ids-input">
+                                </button>
-                                </div>
                             </div>
 
-                            <a role="button" class="btn btn-info pull-right"
+                            <a role="button"
-                               ui-sref=".new_riskEvent" title="New Event">
+                               class="btn btn-info pull-right"
-                                <i class="fa fa-plus"></i>
+                               ui-sref=".new_riskEvent"
-                                New Event
+                               title="New Event">
+                                <i class="fa fa-plus"></i>New Event
                             </a>
                         </div>
                     </div>
-
                 </div>
+
                 <div class="box">
                     <div class="box-header">
                         <h3 class="box-title">RiskEvent List</h3>
@@ -54,54 +65,43 @@
                     <div class="box-body no-padding table-responsive">
                         <table class="table table-striped">
                             <thead>
-                            <tr>
+                                <tr>
-
+                                    <th>Partner Code</th>
-                                <th>Partner Code</th>
+                                    <th>Order Type</th>
-                                <th>Order Type</th>
+                                    <th>Result Type</th>
-                                <th>Result Type</th>
+                                    <th>Sub Merchant ID</th>
-                                <th>Sub Merchant ID</th>
+                                    <th>Email Status</th>
-                                <th>Email Status</th>
+                                    <th>FillIn Person</th>
-                                <th>FillIn Person</th>
+                                    <th>Description</th>
-                                <th>Description</th>
+                                    <th>Create Time</th>
-                                <th>Create Time</th>
+                                    <th>Operation</th>
-                                <th>Operation</th>
+                                </tr>
-                            </tr>
                             </thead>
                             <tbody>
-                            <tr ng-repeat="riskEvent in riskEvents">
+                                <tr ng-repeat="riskEvent in riskEvents">
-                                <td ng-bind="riskEvent.client_moniker"></td>
+                                    <td ng-bind="riskEvent.client_moniker"></td>
-                                <td>
+                                    <td ng-bind="riskEvent.order_type | orderType"></td>
-                                    <span ng-if="riskEvent.order_type == 1">微信调单</span>
+                                    <td ng-bind="riskEvent.result_type | resultType"></td>
-                                    <span ng-if="riskEvent.order_type == 2">支付宝调单</span>
+                                    <td ng-bind="riskEvent.sub_merchant_id"></td>
-                                    <span ng-if="riskEvent.order_type == 3">RoyalPay调单</span>
+                                    <td ng-bind="riskEvent.email_status | emailStatus"></td>
-                                    <span ng-if="riskEvent.order_type == 4">警告</span>
+                                    <td ng-bind="riskEvent.fillin_person"></td>
-                                    <span ng-if="riskEvent.order_type == 5">通用号调单</span>
+                                    <td ng-bind="riskEvent.description | limitTo:20"></td>
-                                </td>
+                                    <td ng-bind="riskEvent.create_time"></td>
-                                <td>
+                                    <td>
-                                    <span ng-if="riskEvent.result_type == 0">未处理</span>
+                                        <a class="text-primary"
-                                    <span ng-if="riskEvent.result_type == 1">处理中</span>
+                                           role="button"
-                                    <span ng-if="riskEvent.result_type == 2">已处理</span>
+                                           title="Detail"
-                                </td>
+                                           ui-sref="analysis_monitoring.riskEvent_detail({risk_id:riskEvent.risk_id})">
-                                <td ng-bind="riskEvent.sub_merchant_id"></td>
+                                            <i class="fa fa-search"></i> Detail
-                                <td>
+                                        </a>
-                                    <span ng-if="riskEvent.email_status == 0">未发送</span>
+                                    </td>
-                                    <span ng-if="riskEvent.email_status == 1">已发送</span>
+                                </tr>
-                                </td>
-                                <td ng-bind="riskEvent.fillin_person"></td>
-                                <td ng-bind="riskEvent.description | limitTo:20"></td>
-                                <td ng-bind="riskEvent.create_time"></td>
-                                <td>
-                                    <a class="text-primary" role="button" title="Detail"
-                                       ui-sref="analysis_monitoring.riskEvent_detail({risk_id:riskEvent.risk_id})">
-                                        <i class="fa fa-search"></i> Detail
-                                    </a>
-                                </td>
-                            </tr>
                             </tbody>
                         </table>
-
                     </div>
-                    <div class="box-footer" ng-if="riskEvents.length">
+
+                    <div class="box-footer"
+                         ng-if="riskEvents.length">
                         <uib-pagination class="pagination"
                                         total-items="pagination.totalCount"
                                         boundary-links="true"
@@ -112,17 +112,16 @@
                                         previous-text="&lsaquo;"
                                         next-text="&rsaquo;"
                                         first-text="&laquo;"
-                                        last-text="&raquo;"></uib-pagination>
+                                        last-text="&raquo;">
+                        </uib-pagination>
                         <div class="row">
-                            <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
+                            <div class="col-xs-12">
+                                Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+                            </div>
                         </div>
                     </div>
                 </div>
-
-
             </div>
-
         </div>
     </div>
-</div>
 </div>