优化后台奖罚显示

Application/Admin/Controller/StatementMangementController.class.php

@@ -384,7 +384,7 @@ class StatementMangementController extends ThinkController
 
         $list = SM('reward_record', 'tab_')->alias('r')
             ->field('
-                r.id, r.relation_game_id, r.settlement_time, r.confirm_time, r.content, r.reward_type, r.creater_id,r.is_verify,rd.is_check,rd.check_detail,IFNULL(pc.company_belong,0) company_belong,
+                r.id, r.relation_game_id, r.reward_time,r.settlement_time, r.confirm_time, r.content, r.reward_type, r.creater_id,r.is_verify,rd.is_check,rd.check_detail,IFNULL(pc.company_belong,0) company_belong,
                 rd.id as rid, rd.type as detail_type, rd.company_type as detail_company_type, rd.company_id as detail_company_id , rd.company_name as detail_company_name, rd.settlement_type as detail_settlement_type, rd.promote_account as detail_promote_account,rd.amount as detail_amount
             ')
             ->where($map)
@@ -413,6 +413,7 @@ class StatementMangementController extends ThinkController
                         'relation_game_partner' => $companys[1][$games[$item['relation_game_id']]['partner_id']] ?? '无',
                         'settlement_time' => $item['settlement_time'] ? date('Y年m月', $item['settlement_time']) : '-',
                         'confirm_time' => $item['confirm_time'] ? date('Y-m-d', $item['confirm_time']) : '-',
+                        'reward_time' => $item['reward_time'] ? date('Y-m-d', $item['reward_time']) : '-',
                         'content' => $item['content'],
                         'reward_type_text' => RewardModel::$rewardTypes[$item['reward_type']],
                         'maxCount' => 0,
@@ -478,6 +479,7 @@ class StatementMangementController extends ThinkController
 //        ksort($record);
         // dd($record);
         $this->assign('list', $record);
+        // dd($record);
         $this->assign('promoters', array_column(SM('promote', 'tab_')->where(['level'=>1])->field('id, nickname, account')->select(), null, 'id'));
         $this->assign('company_belong',getCompanyBlong());
         

Application/Admin/View/StatementMangement/rewardExport.html

@@ -35,8 +35,8 @@
             <th rowspan="2">序号</th>
             <th>游戏名</th>
             <th>游戏合作方</th>
+            <th>奖惩时间~确认时间</th>
             <th >结算时间</th>
-            <th>奖惩确认时间</th>
             <th style="width: 350px;">事件说明</th>
             <th>奖惩性质</th>
             <th>添加人</th>
@@ -68,8 +68,8 @@
                     <td rowspan="{$data['row']}">{$k}</td>
                     <td>{$data['relation_game_name']}</td>
                     <td>{$data['relation_game_partner']}</td>
+                    <td>{$data['reward_time']}~{$data['confirm_time']}</td>
                     <td>{$data['settlement_time']}</td>
-                    <td>{$data['confirm_time']}</td>
                     <td>{$data['content']}</td>
                     <td>{$data['reward_type_text']}</td>
                     <td>{:get_admin_name($data['creater_id'])}</td>

Application/Admin/View/StatementMangement/rewardManageList.html

@@ -199,8 +199,8 @@
                         <th rowspan="2"><input class="check-all" type="checkbox"></th>
                         <th>游戏名</th>
                         <th>游戏合作方</th>
+                        <th>奖惩时间~确认时间</th>
                         <th >结算时间</th>
-                        <th>奖惩确认时间</th>
                         <th style="width: 350px;">事件说明</th>
                         <th>奖惩性质</th>
                         <th>添加人</th>
@@ -233,8 +233,8 @@
                                 <td rowspan="{$data['row']}"><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                                 <td>{$data['relation_game_name']}</td>
                                 <td>{$data['relation_game_partner']}</td>
+                                <td>{$data['reward_time']}~{$data['confirm_time']}</td>
                                 <td>{$data['settlement_time']}</td>
-                                <td>{$data['confirm_time']}</td>
                                 <td>{$data['content']}</td>
                                 <td>{$data['reward_type_text']}</td>
                                 <td>{:get_admin_name($data['creater_id'])}</td>