From 0030c114660b001c3132cf221d0b5a67204dc5e5 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 16 Jan 2025 15:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ad=E6=9C=BA=E8=8F=9C=E8=B0=B1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java   | 5 +++--
 .../bsd/pjcloud/canteen/service/CanteenDailyMenuService.java | 3 ++-
 .../canteen/service/impl/CanteenDailyMenuServiceImpl.java    | 3 ++-
 .../src/main/resources/mapper/CanteenDailyMenuMapper.xml     | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
index db089491e..690178956 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.canteen.mapper;
 
+import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
@@ -24,6 +25,6 @@ public interface CanteenDailyMenuMapper extends PjcloudBaseMapper<CanteenDailyMe
      * @param categoryId
      * @return
      */
-    Object getCanteenMenuList(@Param("day") String day,@Param("hourType") Integer hourType,
-                              @Param("categoryId") Long categoryId,DataScope dataScope);
+    List<ADCanteenDailyMenuListVO> getCanteenMenuList(@Param("day") String day, @Param("hourType") Integer hourType,
+                                                       @Param("categoryId") Long categoryId, DataScope dataScope);
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
index ea6a380f7..d5f4d3fe6 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
+import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 
 import java.util.ArrayList;
@@ -46,7 +47,7 @@ public interface CanteenDailyMenuService extends IService<CanteenDailyMenuEntity
      * @param categoryId
      * @return
      */
-    Object getCanteenMenuListScope(String day, Integer hourType, Long categoryId);
+    List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId);
 
     Page selectTimeFoodPage(Page page, DailyMenuDTO dailyMenuDTO);
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
index 221917599..7ff10a6d5 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
@@ -9,6 +9,7 @@ import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
+import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenDailyMenuMapper;
@@ -112,7 +113,7 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
     }
 
     @Override
-    public Object getCanteenMenuListScope(String day, Integer hourType, Long categoryId) {
+    public  List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId) {
         return baseMapper.getCanteenMenuList(day, hourType, categoryId, DataScope.of());
     }
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
index e16ca33eb..b4e6f4eb9 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
@@ -51,7 +51,7 @@
           And t.del_flag = 0
         </where>
     </select>
-    <select id="getCanteenMenuList" resultType="java.lang.Object">
+    <select id="getCanteenMenuList" resultMap="adCanteenDailyMenuListVO">
         SELECT
             sp.id as spuId,
             t.id,