diff --git a/backstage/application/api/models/Dishes_model.php b/backstage/application/api/models/Dishes_model.php index d582883..671318c 100644 --- a/backstage/application/api/models/Dishes_model.php +++ b/backstage/application/api/models/Dishes_model.php @@ -111,7 +111,7 @@ class Dishes_model extends CI_Model if($real_dishes_type == '()') $real_dishes_type = '(0)'; $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); $data = $query->result(); if($data && $user_type != 0) { diff --git a/backstage/application/backstage/controllers/Datedish.php b/backstage/application/backstage/controllers/Datedish.php index c99eee2..21adebc 100644 --- a/backstage/application/backstage/controllers/Datedish.php +++ b/backstage/application/backstage/controllers/Datedish.php @@ -401,6 +401,7 @@ class Datedish extends CI_Controller{ $dataExcel = readexcel($filePath); //print_r($dataExcel);exit; $datedishs = array(); + $dish_idx = count($dataExcel); foreach ($dataExcel as $idx => $data) { //处理日期 if($idx == 0) { @@ -435,9 +436,11 @@ class Datedish extends CI_Controller{ $datedishs[$dataExcel[0][$i]][$dataExcel[1][$i]]['dishs'][] = array( 'name' => $data[$i], 'count' => $data[$i+1], + 'idx' => $dish_idx ); } } + $dish_idx--; } } diff --git a/backstage/application/backstage/models/Date_model.php b/backstage/application/backstage/models/Date_model.php index c90b207..e10435d 100644 --- a/backstage/application/backstage/models/Date_model.php +++ b/backstage/application/backstage/models/Date_model.php @@ -1031,7 +1031,8 @@ class Date_model extends CI_Model ); 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']); } }