From b280e96b7c94b495e94cd90a96ce0e1f57f4abcf Mon Sep 17 00:00:00 2001
From: vguanyiwgd <v-guanyiw.gd@chinatelecom.cn>
Date: Fri, 19 Apr 2024 09:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=93=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id816e439be57256b6468d8bcf75399a231382aa4
---
 backstage/application/api/models/Dishes_model.php        | 2 +-
 backstage/application/backstage/controllers/Datedish.php | 3 +++
 backstage/application/backstage/models/Date_model.php    | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

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']);
 						}
 					}