批量添加菜品,增加排序
Change-Id: Id816e439be57256b6468d8bcf75399a231382aa4
This commit is contained in:
parent
755d30156e
commit
b280e96b7c
|
@ -111,7 +111,7 @@ class Dishes_model extends CI_Model
|
||||||
if($real_dishes_type == '()') $real_dishes_type = '(0)';
|
if($real_dishes_type == '()') $real_dishes_type = '(0)';
|
||||||
$sql .= " and a.dish_type in {$real_dishes_type}";
|
$sql .= " and a.dish_type in {$real_dishes_type}";
|
||||||
}
|
}
|
||||||
$sql .= " order by b.idx desc";
|
$sql .= " order by b.idx desc, b.id asc";
|
||||||
$query = $this->db->query($sql);
|
$query = $this->db->query($sql);
|
||||||
$data = $query->result();
|
$data = $query->result();
|
||||||
if($data && $user_type != 0) {
|
if($data && $user_type != 0) {
|
||||||
|
|
|
@ -401,6 +401,7 @@ class Datedish extends CI_Controller{
|
||||||
$dataExcel = readexcel($filePath);
|
$dataExcel = readexcel($filePath);
|
||||||
//print_r($dataExcel);exit;
|
//print_r($dataExcel);exit;
|
||||||
$datedishs = array();
|
$datedishs = array();
|
||||||
|
$dish_idx = count($dataExcel);
|
||||||
foreach ($dataExcel as $idx => $data) {
|
foreach ($dataExcel as $idx => $data) {
|
||||||
//处理日期
|
//处理日期
|
||||||
if($idx == 0) {
|
if($idx == 0) {
|
||||||
|
@ -435,9 +436,11 @@ class Datedish extends CI_Controller{
|
||||||
$datedishs[$dataExcel[0][$i]][$dataExcel[1][$i]]['dishs'][] = array(
|
$datedishs[$dataExcel[0][$i]][$dataExcel[1][$i]]['dishs'][] = array(
|
||||||
'name' => $data[$i],
|
'name' => $data[$i],
|
||||||
'count' => $data[$i+1],
|
'count' => $data[$i+1],
|
||||||
|
'idx' => $dish_idx
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$dish_idx--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1031,7 +1031,8 @@ class Date_model extends CI_Model
|
||||||
);
|
);
|
||||||
|
|
||||||
if($trs) {
|
if($trs) {
|
||||||
$param[] = array($trs['id'],2,$v['count'],0,$trs['book_type']);
|
$dish_idx = isset($v['idx']) ? $v['idx'] : 0;
|
||||||
|
$param[] = array($trs['id'],2,$v['count'],$dish_idx,$trs['book_type']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue