zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud

Browse Source
This commit is contained in:
dzc committed 2025-01-16 15:34:33 +08:00
2 parents bc0217e01d 3e5c0d9117
commit 64da3a89f5
4 files changed
+8 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
+3 -2
View File
@@ -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);
}
pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
+2 -1
View File
@@ -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);
}
pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
+2 -1
View File
@@ -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());
}
pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
+1 -1
View File
@@ -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,