fix html

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 boolean recent_client = false;
     public JSONObject toParams(String timezone) {
         JSONObject params = new JSONObject();
         if (timezone != null) {
@@ -94,6 +95,14 @@ public class AnalysisBean {
         return params;
     }
 
+    public boolean isRecent_client() {
+        return recent_client;
+    }
+
+    public void setRecent_client(boolean recent_client) {
+        this.recent_client = recent_client;
+    }
+
     public String getBegin() {
         return begin;
     }

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

@@ -79,6 +79,9 @@ public class PartnersAnalysisController {
                 params.put("bd_group_bd",analysis.getGroup_bd());
             }
         }
+        if (analysis.isRecent_client()){
+            params.put("recent_client",true);
+        }
         return partnersAnalysisService.getPartnersSettlementAnalysis(params);
     }
 }

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml

@@ -157,11 +157,10 @@
                 THEN 'T+2'
             WHEN 3
                 THEN 'T+3'
-           END AS  settlement_cycle
+           END AS  clean_days
         FROM sys_clients c
          <where>
-            c.client_id IS not null AND c.merchant_id IS NOT NULL
+            c.client_id IS not null AND (c.approve_result = 1 OR c.approve_result= 2) AND c.is_valid = 1
-          AND (c.approve_result = 1 OR c.approve_result= 2) AND c.is_valid = 1
              <if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
              <if test="org_ids!=null">and org_id in
               <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
@@ -173,9 +172,8 @@
              <if test="bd_group_bd">and c.manager_id=#{bd_group_bd}</if>)
              </if>
             <if test="recent_client!=null">
-            c.client_id  in
+                AND c.client_id  in (SELECT p.client_id FROM sys_clients p INNER JOIN statistics_customer_order o ON o.client_id = p.client_id AND o.client_id !=0
-        (SELECT p.client_id FROM sys_clients p INNER JOIN statistics_customer_order o ON o.client_id = p.client_id AND o.client_id !=0
+                 WHERE datediff(now(), o.date) <![CDATA[ <= ]]>230 AND p.client_id is not null GROUP BY p.client_id)
-        WHERE datediff(now(), o.date) <![CDATA[ <= ]]>30 AND p.client_id is not null GROUP BY p.client_id)
             </if>
         </where>
         GROUP by c.clean_days

src/main/ui/static/analysis/partners-analysis.js

@@ -23,6 +23,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 if (!$scope.params.onlyGroup){
                     $scope.loadPartnersInTypes();
                     $scope.doAnalysis();
+                    $scope.loadTradePartnersBySettlementCycle();
                     return;
                 }
                 if (groupBD == 'all') {
@@ -36,6 +37,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 }
                 $scope.loadPartnersInTypes();
                 $scope.doAnalysis();
+                $scope.loadTradePartnersBySettlementCycle();
             };
             $scope.loadRoyalpayindustry = function () {
                 $http.get('/static/data/royalpayindustry.json').then(function (resp) {
@@ -177,6 +179,17 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 }
             };
             $scope.loadTradePartnersBySettlementCycle = function () {
+                var params = angular.copy($scope.params);
+                $http.get('/analysis/partners/settlement', {params:params}).then(function (resp) {
+                    $scope.settlementCycle = resp.data;
+                    $scope.partners_settlement_chart = chartParser.parse(partnersBySettlementCycle, resp.data);
+                });
+            };
+            $scope.loadTradePartnersBySettlementCycle();
+            $scope.chooseThirtyDays = function () {
+                $scope.params.recent_client = true;
+                $scope.loadTradePartnersBySettlementCycle();
+            };
             var partnersBySettlementCycle = {
                 chart: {
                     tooltip: {
@@ -204,15 +217,9 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                             }
                         }
                     },
-                        column: {key: 'client_count', name: 'settlement_cycle'}
+                    column: {key: 'client_count', name: 'clean_days'}
                 }]
             };
-                $http.get('/analysis/partners/settlement', {params:{}}).then(function (resp) {
-                    $scope.settlementCycle = resp.data;
-                    $scope.partners_settlement_chart = chartParser.parse(partnersBySettlementCycle, resp.data);
-                });
-            };
-            $scope.loadTradePartnersBySettlementCycle();
             /*var partnerTypesConfig = function (legend) {
                 return {
                     chart: {

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

@@ -61,8 +61,8 @@
                 <div class="box box-warning">
                     <div class="box-header pull-right">
                         <div class="btn-group" role="group">
-                            <button type="button" class="btn btn-info" ng-click="showIndustry();display=false" ng-class="{'active':!display}">行业</button>
+                            <button type="button" class="btn btn-info" ng-click="display=false" ng-class="{'active':!display}">行业</button>
-                            <button type="button" class="btn btn-info" ng-click="showCycle();display=true" ng-class="{'active':display}">周期</button>
+                            <button type="button" class="btn btn-info" ng-click="display=true" ng-class="{'active':display}">周期</button>
                         </div>
                     </div>
                     <div class="box-body" ng-if="!display">
@@ -101,8 +101,13 @@
                     <div class="box-body" ng-if="display">
                         <div class="col-sm-12">
                             <div class="col-sm-6 col-xs-12">
-                                <p class="text-center">商户结算周期分布</p>
+                                <p class="text-center">商户结算周期分布
-                                <div class="chart" style="height: 400px" echarts="partners_settlement_chart"
+                                <span class="btn-group" role="group">
+                                    <button type="button" class="btn btn-primary btn-xs" ng-click="loadTradePartnersBySettlementCycle();choose=false" ng-class="{'active':!choose}">All</button>
+                                    <button type="button" class="btn btn-primary btn-xs" ng-click="chooseThirtyDays();choose=true" ng-class="{'active':choose}">recent 30 days</button>
+                                </span>
+                                </p>
+                                <div class="chart" style="height: 300px" echarts="partners_settlement_chart"
                                      chart-setter="partner_type_chart($chart)"
                                      ng-class="{nodata:partners_settlement_chart.nodata}"></div>
                             </div>
@@ -117,7 +122,7 @@
                                     </thead>
                                     <tbody>
                                     <tr ng-repeat="cycle in settlementCycle">
-                                        <td ng-bind="cycle.settlement_cycle"></td>
+                                        <td ng-bind="cycle.clean_days"></td>
                                         <td ng-bind="cycle.client_count"></td>
                                     </tr>
                                     </tbody>