下游公司字段与上游公司字段一致

Application/Admin/Controller/CpJuheCompanyController.class.php

@@ -56,11 +56,36 @@ class CpJuheCompanyController extends ThinkController {
                 $list_data[$key]['agreement_time'] = json_decode($list_data[$key]['agreement_time'],true);
                 $list_data[$key]['balance_time'] = json_decode($list_data[$key]['balance_time'],true);
 
-                $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['start_time']);
-                ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = "");
+//                $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['start_time']);
+//                ($list_data[$key]['agreement_time']['end_time']!=1)?($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d",$list_data[$key]['agreement_time']['end_time'])):($list_data[$key]['agreement_time']['end_time'] = "");
+//
+//                $list_data[$key]['balance_time']['start_time'] = date("Y-m-d",$list_data[$key]['balance_time']['start_time']);
+//                ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = "");
+
+                if ($list_data[$key]['agreement_time']['start_time']) {
+                    $list_data[$key]['agreement_time']['start_time'] = date("Y-m-d", $list_data[$key]['agreement_time']['start_time']);
+                } else {
+                    $list_data[$key]['agreement_time']['start_time'] = "未设置";
+                }
+
+                if($list_data[$key]['agreement_time']['end_time']) {
+                    ($list_data[$key]['agreement_time']['end_time'] != 1) ? ($list_data[$key]['agreement_time']['end_time'] = date("Y-m-d", $list_data[$key]['agreement_time']['end_time'])) : ($list_data[$key]['agreement_time']['end_time'] = "");
+                } else {
+                    $list_data[$key]['agreement_time']['end_time'] = "未设置";
+                }
+
+                if ($list_data[$key]['balance_time']['start_time']) {
+                    $list_data[$key]['balance_time']['start_time'] = date("Y-m-d", $list_data[$key]['balance_time']['start_time']);
+                } else {
+                    $list_data[$key]['balance_time']['start_time'] = "未设置";
+                }
+
+                if($list_data[$key]['balance_time']['end_time']) {
+                    ($list_data[$key]['balance_time']['end_time'] != 1) ? ($list_data[$key]['balance_time']['end_time'] = date("Y-m-d", $list_data[$key]['balance_time']['end_time'])) : ($list_data[$key]['balance_time']['end_time'] = "");
+                } else {
+                    $list_data[$key]['balance_time']['end_time'] = "未设置";
+                }
 
-                $list_data[$key]['balance_time']['start_time'] = date("Y-m-d",$list_data[$key]['balance_time']['start_time']);
-                ($list_data[$key]['balance_time']['end_time']!=1)?($list_data[$key]['balance_time']['end_time'] = date("Y-m-d",$list_data[$key]['balance_time']['end_time'])):($list_data[$key]['balance_time']['end_time'] = "");
             }
 
             $this->assign("listdata",$list_data);

Application/Admin/View/CpJuheCompany/export.html

@@ -112,6 +112,9 @@
           <th >是否有预付款</th>
           <th >预付款金额</th>
           <th >是否签署合同</th>
+
+          <th >是否具有游戏资质</th>
+
           <th >合同期限</th>
           <th >生效时间</th>
           <th >开票税点</th>
@@ -157,6 +160,9 @@
               <td rowspan="{$vo.rowspan}">{$vo.is_surplus|default="否"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.before_amount|default="0"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.is_contract|default="------"}</td>
+
+              <td rowspan="{$vo.rowspan}">{$vo.is_qualifity|default="否"}</td>
+
               <td rowspan="{$vo.rowspan}">
                 <span class="form-required" style="line-height: 30px;">{$vo['agreement_time']['start_time']}</span>—
                 <span class="form-required" style="line-height: 30px;">{$vo['agreement_time']['end_time']|default="永久"}</span></td>

Data/update.sql

@@ -2117,4 +2117,7 @@ CREATE TABLE `tab_market_altogether`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic;
 
-INSERT INTO `tab_tool`(`id`, `name`, `title`, `config`, `type`, `status`) VALUES (59, 'tax_radio', '公司税费', '{"tax_radio":1.5,"time":1589361782}', 1, 1)
+INSERT INTO `tab_tool`(`id`, `name`, `title`, `config`, `type`, `status`) VALUES (59, 'tax_radio', '公司税费', '{"tax_radio":1.5,"time":1589361782}', 1, 1)
+
+ALTER TABLE `sj_game_channel`.`sj_cptogether_company`
+ADD COLUMN `is_qualifity` tinyint(2) NULL COMMENT '是否具有游戏资质 0 否 1 是' AFTER `is_received`;