补点功能修正

Application/Admin/Controller/CompanyStatementController.class.php

@@ -1181,7 +1181,7 @@ class CompanyStatementController extends ThinkController
             $radioMap['_string'] = "start_time < {$end_time}";
         }
         $map['tab_spend.pay_status'] = 1;
-        $map['pay_way'] = ['egt',1];
+        $map['pay_way'] = ['egt',0];
 
         $data = M("spend","tab_")
             ->field("pay_amount,relation_game_id,relation_game_name,payed_time")

Application/Admin/View/CompanyStatement/viewSpecialComplement.html

@@ -431,14 +431,16 @@
                                         //时间数组定义用于判断当前选择的游戏是否有结算过的区间
                                         var begin_time = [];
                                         var end_time = [];
-
                                         var get_time = $(cval).parent();
-
                                         var row =$(cval).attr('rowspan');
 
                                         for (var i=0; i<row; i++) {
                                             for(var item_sec in data[item]['relation_game_name']) {
-                                                if (get_time.find('.relation_game_name').text() == data[item]['relation_game_name'][item_sec] && data[item]['begin_time'][item_sec] == get_time.find('.begin_time').text()&& data[item]['end_time'][item_sec] == get_time.find('.end_time').text()) {
+
+                                                if (get_time.find('.relation_game_name').text() == data[item]['relation_game_name'][item_sec]
+                                                  && ((data[item]['begin_time'][item_sec] >= get_time.find('.begin_time').text()&&data[item]['begin_time'][item_sec] <= get_time.find('.end_time').text())
+                                                    || (data[item]['end_time'][item_sec] >= get_time.find('.begin_time').text()&&data[item]['end_time'][item_sec] <= get_time.find('.end_time').text())
+                                                  ||(data[item]['begin_time'][item_sec]<=get_time.find('.begin_time').text()&&data[item]['end_time'][item_sec]>=get_time.find('.end_time').text()))) {
 
                                                     begin_time.push(get_time.find('.begin_time').text());
                                                     end_time.push(get_time.find('.end_time').text());
@@ -448,6 +450,7 @@
                                             get_time = get_time.next();
                                         }
 
+
                                         for (var time in begin_time) {
 
                                             if ((begin_time[time]>=time_start && begin_time[time]<=time_end) || (end_time[time]>=time_start && end_time[time]<=time_end)||(begin_time[time]<=time_start && end_time[time] >= time_end)) {