From 6f75b0e6d83a031e70e1292f695049540ecdf481 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 11:53:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E6=97=A0=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 2cf88fd48..22ab90e12 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -526,7 +526,7 @@ class CompanyStatementSetController extends Controller { "company_type"=>1 ]; //获取pc公司 - $tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,contact_phone link_phone,bank_name opening_bank,bank_address payee_name,bank_card bank_account,fax_ratio,taxation_rate,company_belong,company_type,ali_user,ali_account,has_server_fee,server_fee,has_ratio,turnover_ratio") + $tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,address,contact_phone link_phone,bank_name opening_bank,bank_address payee_name,bank_card bank_account,fax_ratio,taxation_rate,company_belong,company_type,ali_user,ali_account,has_server_fee,server_fee,has_ratio,turnover_ratio") ->where($pc_map) ->select(); if(empty($tmpp)){ From 205c6a83f818b01ad757a2ce3e88a2a224ce8229 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 11:57:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index cb86086db..7e806abbc 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2049,7 +2049,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['receive_company']['link_phone']);//联系电话 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['receive_company']['address']);//邮寄地址 // $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $value['pay_amount']);//请汇入此账号 - $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['bank_account_name']);//户名 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['payee_name']);//户名 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']);//银行账号 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行 From 3318298d2ef78bb7cd0795be812890661556beac Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 14:38:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E6=B8=B8=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 46 +++++++++++-------- .../PromoteCompanyController.class.php | 39 +++++++++++----- 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 5103114e2..6540bf3af 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -163,21 +163,22 @@ class PartnerController extends ThinkController } $value['has_server_fee'] = $value['has_server_fee'] ? '是' : '否'; $value['cooperation_status'] = $value['cooperation_status'] ? '合作中' : '暂停合作'; - - - - $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司'; - $contract_start_time = $value['contract_start_time'] ? - time_format($value['contract_start_time'], 'Y/m/d') : '-'; - $contract_end_time = $value['contract_end_time'] ? - time_format($value['contract_end_time'], 'Y/m/d') : '-'; + + $contract_start_time = $value['contract_start_time'] ? time_format($value['contract_start_time'], 'Y/m/d') : '-'; + if($value['contract_start_time']){ + $contract_end_time = $value['contract_end_time'] ? date('Y/m/d', $value['contract_end_time']) : '永久'; + }else{ + $contract_end_time = $value['contract_end_time'] ? time_format($value['contract_end_time'], 'Y/m/d') : '-'; + } $value['contract_time'] = $contract_start_time . '-' . $contract_end_time; - $validity_start_time = $value['validity_start_time'] ? - time_format($value['validity_start_time'], 'Y/m/d') : '-'; - $validity_end_time = $value['validity_end_time'] ? - time_format($value['validity_end_time'], 'Y/m/d') : '-'; + $validity_start_time = $value['validity_start_time'] ? time_format($value['validity_start_time'], 'Y/m/d') : '-'; + if($value['validity_start_time']){ + $validity_end_time = $value['validity_end_time'] ? date('Y/m/d', $value['validity_end_time']) : '永久'; + }else{ + $validity_end_time = $value['validity_end_time'] ? time_format($value['validity_end_time'], 'Y/m/d') : '-'; + } $value['validity_time'] = $validity_start_time . '-' . $validity_end_time; $row2 = array_sum(array_column($value['game'], 'row')) ; @@ -192,7 +193,6 @@ class PartnerController extends ThinkController $this->display("export"); die(); } - /* 查询记录总数 */ $count = $model ->where($map) @@ -261,17 +261,25 @@ class PartnerController extends ThinkController } $v['partner_info']['company_type'] = $v['partner_info']['company_type'] == 2 ? '个人' : '公司'; - $contract_start_time = $v['partner_info']['contract_start_time'] ? - time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-'; - $contract_end_time = $v['partner_info']['contract_end_time'] ? - time_format($v['partner_info']['contract_end_time'], 'Y/m/d') : '-'; + + $contract_start_time = $v['partner_info']['contract_start_time'] ? time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-'; + if($v['partner_info']['contract_start_time']){ + $contract_end_time = $v['partner_info']['contract_end_time'] ? date('Y/m/d', $v['partner_info']['contract_end_time']) : '永久'; + }else{ + $contract_end_time = $v['partner_info']['contract_end_time'] ? time_format($v['partner_info']['contract_end_time'], 'Y/m/d') : '-'; + } $v['contract_time'] = $contract_start_time . '-' . $contract_end_time; $validity_start_time = $v['partner_info']['validity_start_time'] ? time_format($v['partner_info']['validity_start_time'], 'Y/m/d') : '-'; - $validity_end_time = $v['partner_info']['validity_end_time'] ? - time_format($v['partner_info']['validity_end_time'], 'Y/m/d') : '-'; + + if($v['partner_info']['validity_start_time']){ + $validity_end_time = $v['partner_info']['validity_end_time'] ? date('Y/m/d', $v['partner_info']['validity_end_time']) : '永久'; + }else{ + $validity_end_time = $v['partner_info']['validity_end_time'] ? time_format($v['partner_info']['validity_end_time'], 'Y/m/d') : '-'; + } $v['validity_time'] = $validity_start_time . '-' . $validity_end_time; + $create_time = date("Y-m-d H:i:s",$v["create_time"]); $v['verify_log'] = json_decode($v['verify_log'], true); diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index a176eea7b..ccfc01f04 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -121,17 +121,24 @@ class PromoteCompanyController extends ThinkController $v["develop_type"] = getCompanyRelation($v["develop_type"]); $v['company_type'] = $v['company_type'] == 2 ? '个人' : '公司'; $v['is_sign_contact'] = $v['is_sign_contact'] ? '是' : '否'; - $contract_start_time = $v['contact_begin'] ? - time_format($v['contact_begin'], 'Y/m/d') : '-'; - $contract_end_time = $v['contact_end'] ? - time_format($v['contact_end'], 'Y/m/d') : '-'; + + $contract_start_time = $v['contact_begin'] ? time_format($v['contact_begin'], 'Y/m/d') : '-'; + if($v['contact_begin']){ + $contract_end_time = $v['contact_end'] ? date('Y/m/d', $v['contact_end']) : '永久'; + }else{ + $contract_end_time = $v['contact_end'] ? time_format($v['contact_end'], 'Y/m/d') : '-'; + } $v['contract_time'] = $contract_start_time . '-' . $contract_end_time; - $validity_start_time = $v['validity_start_time'] ? - time_format($v['validity_start_time'], 'Y/m/d') : '-'; - $validity_end_time = $v['validity_end_time'] ? - time_format($v['validity_end_time'], 'Y/m/d') : '-'; + $validity_start_time = $v['validity_start_time'] ? time_format($v['validity_start_time'], 'Y/m/d') : '-'; + if($v['validity_start_time']){ + $validity_end_time = $v['validity_end_time'] ? date('Y/m/d', $v['validity_end_time']) : '永久'; + }else{ + $validity_end_time = $v['validity_end_time'] ? time_format($v['validity_end_time'], 'Y/m/d') : '-'; + } $v['validity_time'] = $validity_start_time . '-' . $validity_end_time; + + if(!$is_export){ $v['can_del'] = $this->promoteCompanyIsCanDel($v["id"]) ? 1 : 0; } @@ -238,15 +245,23 @@ class PromoteCompanyController extends ThinkController $contract_start_time = $v['company_info']['contact_begin'] ? time_format($v['company_info']['contact_begin'], 'Y/m/d') : '-'; - $contract_end_time = $v['company_info']['contact_end'] ? - time_format($v['company_info']['contact_end'], 'Y/m/d') : '-'; + if($v['company_info']['contact_begin']){ + $contract_end_time = $v['company_info']['contact_end'] ? date('Y/m/d', $v['company_info']['contact_end']) : '永久'; + }else{ + $contract_end_time = $v['company_info']['contact_end'] ? time_format($v['company_info']['contact_end'], 'Y/m/d') : '-'; + } $v['contract_time'] = $contract_start_time . '-' . $contract_end_time; $validity_start_time = $v['company_info']['validity_start_time'] ? time_format($v['company_info']['validity_start_time'], 'Y/m/d') : '-'; - $validity_end_time = $v['company_info']['validity_end_time'] ? - time_format($v['company_info']['validity_end_time'], 'Y/m/d') : '-'; + + if($v['company_info']['validity_start_time']){ + $validity_end_time = $v['company_info']['validity_end_time'] ? date('Y/m/d', $v['company_info']['validity_end_time']) : '永久'; + }else{ + $validity_end_time = $v['company_info']['validity_end_time'] ? time_format($v['company_info']['validity_end_time'], 'Y/m/d') : '-'; + } $v['validity_time'] = $validity_start_time . '-' . $validity_end_time; + $create_time = date("Y-m-d H:i:s",$v["create_time"]); $v['verify_log'] = json_decode($v['verify_log'], true);