Commit d5a5ba04 authored by wangjiangze's avatar wangjiangze

update

parent d038fd63
...@@ -34,11 +34,11 @@ class SpAction extends CommonAction{ ...@@ -34,11 +34,11 @@ class SpAction extends CommonAction{
$info =$model->where("id = $id")->find(); $info =$model->where("id = $id")->find();
$this->info = $info; $this->info = $info;
} }
$sp_lists = $spModel->where("`status`=0")->select(); // $sp_lists = $spModel->where("`status`=0")->select();
$conf_type_lists = $confTypeModel->join(" A left join sh_sp_config B on A.`code` = B.type_code and B.sp_id = $id ")->field("A.id,A.`name`,A.remark,A.`code`,A.`v` default_v,B.`v`")->select(); $conf_type_lists = $confTypeModel->join(" A left join sh_sp_config B on A.`code` = B.type_code and B.sp_id = $id ")->field("A.id,A.`name`,A.remark,A.`code`,A.`v` default_v,B.`v`")->select();
$region_lists = $regionModel->where("pid = 1 and `status`=0")->select(); $region_lists = $regionModel->where("pid = 1 and `status`=0")->select();
$region_city_lists = $regionModel->where("pid > 1 and `status`=0")->select(); $region_city_lists = $regionModel->where("pid > 1 and `status`=0")->select();
$this->sp_lists = $sp_lists; // $this->sp_lists = $sp_lists;
$this->conf_type_lists = $conf_type_lists; $this->conf_type_lists = $conf_type_lists;
$this->region_lists = $region_lists; $this->region_lists = $region_lists;
$this->region_city_lists = $region_city_lists; $this->region_city_lists = $region_city_lists;
...@@ -96,20 +96,20 @@ class SpAction extends CommonAction{ ...@@ -96,20 +96,20 @@ class SpAction extends CommonAction{
} }
} }
//sh_hotel_media_map 生成表 格式 sh_hotel_media_map_合作方ID //sh_hotel_media_map 生成表 格式 sh_hotel_media_map_合作方ID
//$create_table_sql = <<<EOF $create_table_sql = <<<EOF
// CREATE TABLE IF NOT EXISTS `sh_hotel_media_map_$id` ( CREATE TABLE `sh_hotel_media_map` (
//`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
//`media_id` int(11) NOT NULL DEFAULT '0' COMMENT '媒资id', `media_id` int(11) NOT NULL DEFAULT '0' COMMENT '媒资id',
//`hotel_id` int(11) NOT NULL DEFAULT '0' COMMENT '酒店id', `hotel_id` int(11) NOT NULL DEFAULT '0' COMMENT '酒店id',
//`status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '播控状态:0删除,1上线,2下线', `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '播控状态:0删除,1上线,2下线',
//`status_inject` tinyint(4) NOT NULL DEFAULT '0' COMMENT '注入状态:0未注入,1已注入,2注入失败', `status_inject` tinyint(4) NOT NULL DEFAULT '0' COMMENT '注入状态:0未注入,1已注入,2注入失败',
//`addtime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `addtime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
//`updatetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `updatetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
//PRIMARY KEY (`id`) PRIMARY KEY (`id`)
//) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='酒店片库映射表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='酒店片库映射表'
//EOF; EOF;
$create_table_sql = "create table sh_hotel_media_map_$id like sh_hotel_media_map;"; // $create_table_sql = "create table sh_hotel_media_map_$id like sh_hotel_media_map;";
$model->query($create_table_sql); $model->query($create_table_sql);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment