Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage

src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java

@@ -36,6 +36,7 @@ public class AnalysisBean {
     private String amount_from;
     private String amount_to;
     private String bd_name;
+    private String timezone;
     public JSONObject toParams(String timezone) {
         JSONObject params = new JSONObject();
         if (timezone != null) {
@@ -229,4 +230,12 @@ public class AnalysisBean {
     public void setBd_name(String bd_name) {
         this.bd_name = bd_name;
     }
+
+    public String getTimezone() {
+        return timezone;
+    }
+
+    public void setTimezone(String timezone) {
+        this.timezone = timezone;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java

@@ -31,7 +31,7 @@ public class DashboardController {
 
     @ManagerMapping("/common_analysis_1")
     public JSONObject commonAnalysis1(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        JSONObject params = analysis.toParams(null);
+        JSONObject params = analysis.toParams(analysis.getTimezone());
         orgManager.checkOrg(manager,params);
         return dashboardService.getCommonAnalysis1(params);
     }

src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java

@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.mappers.risk;
 
+import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
 import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
 import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
 import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
@@ -26,6 +27,7 @@ public interface RiskAttentionMerchantsAMapper {
     JSONObject findByClientMoniker(@Param("client_moniker") String client_moniker);
 
     @AutoSql(type = SqlType.SELECT)
+    @AdvanceSelect(addonWhereClause = "is_valid=1")
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
 }

src/main/ui/static/boot/application-boot.js

@@ -28,7 +28,8 @@ require.config({
         dragdrop: 'static/lib/angular-plugins/angular-drag-and-drop-lists.min',
         echarts: 'static/lib/echarts/echarts.common.min',
         angularEcharts: 'static/commons/angular-echarts',
-        decimal:'static/lib/decimal/decimal.min'
+        decimal:'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
     },
     shim: {
         'angular': {deps: ['jquery'], exports: 'angular'},

src/main/ui/static/boot/index-boot.js

@@ -28,7 +28,8 @@ require.config({
         dragdrop: 'static/lib/angular-plugins/angular-drag-and-drop-lists.min',
         echarts: 'static/lib/echarts/echarts.common.min',
         angularEcharts: 'static/commons/angular-echarts',
-        decimal:'static/lib/decimal/decimal.min'
+        decimal:'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
     },
     shim: {
         'angular': {deps: ['jquery','decimal'], exports: 'angular'},

src/main/ui/static/boot/manager-boot.js

@@ -30,7 +30,8 @@ require.config({
         ueditor: 'static/lib/ueditor/ueditor.all.min',
         ueditorConfig: 'static/lib/ueditor/ueditor.config',
         angularEcharts: 'static/commons/angular-echarts',
-        decimal: 'static/lib/decimal/decimal.min'
+        decimal: 'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
     },
     shim: {
         'angular': {deps: ['jquery', 'decimal'], exports: 'angular'},

src/main/ui/static/dashboard/dashboard.js

@@ -2,7 +2,7 @@
  * Created by davep on 2016-07-27.
  */
 
-define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angular) {
+define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], function (angular) {
     'use strict';
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('dashboardApp', ['ui.router', 'ui.bootstrap', 'ngEcharts']);
@@ -25,7 +25,8 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                 params: function () {
                     return {
                         begin: $filter('date')(new Date(), 'yyyyMMdd'),
-                        end: $filter('date')(new Date(), 'yyyyMMdd')
+                        end: $filter('date')(new Date(), 'yyyyMMdd'),
+                        timezone: jstz.determine().name()
                     }
                 }
             },