bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

食堂-根据阿里规约扫描对问题进行修复

This commit is contained in:
jjLv 2025-05-29 10:15:27 +08:00
parent 742501a9fc
commit 71bcaa0e07
25 changed files with 121 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesController.java
View File

@ -3,20 +3,16 @@ package com.bonus.canteen.core.cook.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookDishes;
import com.bonus.canteen.core.cook.service.ICookDishesService;
import com.bonus.common.core.web.controller.BaseController;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesMaterialController.java
View File

@ -3,20 +3,16 @@ package com.bonus.canteen.core.cook.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookDishesMaterial;
import com.bonus.canteen.core.cook.service.ICookDishesMaterialService;
import com.bonus.common.core.web.controller.BaseController;

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesTypeController.java
View File

@ -1,31 +1,24 @@
package com.bonus.canteen.core.cook.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.canteen.core.common.utils.TreeNodeUtil;
import com.bonus.canteen.core.cook.vo.CookDishesTypeVO;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookDishesType;
import com.bonus.canteen.core.cook.service.ICookDishesTypeService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.page.TableDataInfo;
/**
* 菜品类型信息Controller

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookMaterialController.java
View File

@ -3,20 +3,16 @@ package com.bonus.canteen.core.cook.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookMaterial;
import com.bonus.canteen.core.cook.service.ICookMaterialService;
import com.bonus.common.core.web.controller.BaseController;

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookMaterialTypeController.java
View File

@ -3,26 +3,21 @@ package com.bonus.canteen.core.cook.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookMaterialType;
import com.bonus.canteen.core.cook.service.ICookMaterialTypeService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.page.TableDataInfo;
/**
* 原料类别Controller

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookNutritionController.java
View File

@ -5,20 +5,16 @@ import javax.servlet.http.HttpServletResponse;
import com.bonus.canteen.core.cook.vo.NutritionTypeVO;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookNutrition;
import com.bonus.canteen.core.cook.service.ICookNutritionService;
import com.bonus.common.core.web.controller.BaseController;

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookNutritionTypeController.java
View File

@ -5,26 +5,21 @@ import javax.servlet.http.HttpServletResponse;
import com.bonus.canteen.core.cook.vo.NutritionTypeVO;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.cook.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.cook.domain.CookNutritionType;
import com.bonus.canteen.core.cook.service.ICookNutritionTypeService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.page.TableDataInfo;
/**
* 食材营养基础类型Controller

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookDishesTypeMapper.java
View File

@ -75,5 +75,10 @@ public interface CookDishesTypeMapper {
*/
public int checkIsUse(@Param("dishesTypeIds") Long[] dishesTypeIds);
/**
* 查询菜品类型信息列表
* @param cookDishesType 入参
* @return 菜品类型集合
*/
List<CookDishesTypeVO> selectList(CookDishesType cookDishesType);
}

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookNutritionTypeMapper.java
View File

@ -82,6 +82,7 @@ public interface CookNutritionTypeMapper {
public List<NutritionTypeVO> selectBigTypeList();
/**
* 获取所有食材小类
* @param id 食材营养基础类型id
* @return 食材小类列表
*/
public List<NutritionTypeVO> selectLittleTypeList(String id);

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDishesMapper.java
View File

@ -58,5 +58,10 @@ public interface CookRecipeDishesMapper {
*/
public int deleteCookRecipeDishesByIds(Long[] ids);
/**
* 删除菜谱关联菜品信息
* @param recipeDetailIds id集合
* @return 是否成功
*/
public int deleteCookRecipeDishesByCookRecipeDetailIds(Long[] recipeDetailIds);
}

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/ICookDishesTypeService.java
View File

@ -58,6 +58,11 @@ public interface ICookDishesTypeService {
* @return 结果
*/
public int deleteCookDishesTypeByDishesTypeId(Long dishesTypeId);
/**
* 查询菜品类型信息
*
* @param cookDishesType 菜品类型信息
* @return 结果
*/
List<CookDishesTypeVO> selectList(CookDishesType cookDishesType);
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/NutritionTypeVO.java
View File

@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author 19814
*/
@Data
public class NutritionTypeVO {

16
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/service/DataScreeningService.java
View File

@ -1,16 +0,0 @@
package com.bonus.canteen.core.dataScreening.service;
import com.bonus.canteen.core.dataScreening.dto.DataScreenDTO;
import com.bonus.common.core.web.domain.AjaxResult;
public interface DataScreeningService {
AjaxResult getDataScreeningModel();
AjaxResult getCanteenOrdersAndSalesTrends(DataScreenDTO dataScreenDTO);
AjaxResult getSupermarketOrderAndSalesTrend(DataScreenDTO dataScreenDTO);
AjaxResult getThisMonthDishSalesRanking();
AjaxResult getProportionOfOrderTypes(DataScreenDTO dataScreenDTO);
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/controller/DeviceInfoController.java
View File

@ -7,20 +7,16 @@ import cn.hutool.core.util.ObjectUtil;
import com.bonus.canteen.core.device.domain.DeviceSearchDTO;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.device.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.canteen.core.device.domain.DeviceInfo;
import com.bonus.canteen.core.device.service.IDeviceInfoService;
import com.bonus.common.core.web.controller.BaseController;

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/domain/DeviceSearchDTO.java
View File

@ -3,6 +3,9 @@ package com.bonus.canteen.core.device.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 19814
*/
@Data
public class DeviceSearchDTO {
@ApiModelProperty("设备sn码")

18
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/mapper/DeviceAppVersionMapper.java
View File

@ -61,10 +61,24 @@ public interface DeviceAppVersionMapper {
*/
public int deleteDeviceAppVersionByIds(Integer[] ids);
/**
* 根据类型查询apk
* @param type 类型
* @param version 版本
* @return 结果
*/
ApkDTO getApkByType(@Param("type") String type, @Param("version") String version);
/**
* 更新apk信息
* @param dto 入参
* @return 结果
*/
int updateApk(ApkDTO dto);
/**
* 新增apk信息
* @param dto 入参
* @return 结果
*/
int insertApk(ApkDTO dto);
}

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/service/IDeviceAppVersionService.java
View File

@ -63,5 +63,10 @@ public interface IDeviceAppVersionService {
*/
public int deleteDeviceAppVersionById(Integer id);
/**
* 上传apk
* @param dto 入参
* @return 结果
*/
AjaxResult uploadApk(@Valid ApkDTO dto);
}

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/controller/DataScreeningController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/controller/DataScreeningController.java
View File

@ -1,7 +1,7 @@
package com.bonus.canteen.core.dataScreening.controller;
package com.bonus.canteen.core.screening.controller;
import com.bonus.canteen.core.dataScreening.dto.DataScreenDTO;
import com.bonus.canteen.core.dataScreening.service.DataScreeningService;
import com.bonus.canteen.core.screening.dto.DataScreenDTO;
import com.bonus.canteen.core.screening.service.DataScreeningService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/dto/DataScreenDTO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/dto/DataScreenDTO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.core.dataScreening.dto;
package com.bonus.canteen.core.screening.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/mapper/DataScreeningMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/mapper/DataScreeningMapper.java
View File

@ -1,7 +1,7 @@
package com.bonus.canteen.core.dataScreening.mapper;
package com.bonus.canteen.core.screening.mapper;
import com.bonus.canteen.core.dataScreening.vo.EchartsVO;
import com.bonus.canteen.core.dataScreening.vo.SingleModelVO;
import com.bonus.canteen.core.screening.vo.EchartsVO;
import com.bonus.canteen.core.screening.vo.SingleModelVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

47
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningService.java Normal file
View File

@ -0,0 +1,47 @@
package com.bonus.canteen.core.screening.service;
import com.bonus.canteen.core.screening.dto.DataScreenDTO;
import com.bonus.common.core.web.domain.AjaxResult;
/**
* @author 19814
*/
public interface DataScreeningService {
/**
* 获取数据总览（今日营业额、订单等）
*
* @return AjaxResult
*/
AjaxResult getDataScreeningModel();
/**
* 获取食堂订单及销量趋势
*
* @param dataScreenDTO 数据筛选条件
* @return AjaxResult
*/
AjaxResult getCanteenOrdersAndSalesTrends(DataScreenDTO dataScreenDTO);
/**
* 获取商超订单及销量趋势
*
* @param dataScreenDTO 数据筛选条件
* @return AjaxResult
*/
AjaxResult getSupermarketOrderAndSalesTrend(DataScreenDTO dataScreenDTO);
/**
* 获取本月菜品销量排名
*
* @return AjaxResult
*/
AjaxResult getThisMonthDishSalesRanking();
/**
* 订单类型占比
*
* @param dataScreenDTO 数据筛选条件
* @return AjaxResult
*/
AjaxResult getProportionOfOrderTypes(DataScreenDTO dataScreenDTO);
}

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/service/DataScreeningServiceImpl.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.bonus.canteen.core.dataScreening.service;
package com.bonus.canteen.core.screening.service;
import com.bonus.canteen.core.dataScreening.dto.DataScreenDTO;
import com.bonus.canteen.core.dataScreening.mapper.DataScreeningMapper;
import com.bonus.canteen.core.dataScreening.vo.EchartsVO;
import com.bonus.canteen.core.dataScreening.vo.SingleModelVO;
import com.bonus.canteen.core.screening.dto.DataScreenDTO;
import com.bonus.canteen.core.screening.mapper.DataScreeningMapper;
import com.bonus.canteen.core.screening.vo.EchartsVO;
import com.bonus.canteen.core.screening.vo.SingleModelVO;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import org.slf4j.Logger;
@ -176,6 +176,7 @@ public class DataScreeningServiceImpl implements DataScreeningService {
: mapper.getSupermarketOrderAndSalesTrend(date, DateUtils.getDate());
List<String> dateList = getDatesBetween(date, DateUtils.getDate(), "yyyy-MM-dd");
// 将list中的数据放入map中，key为orderDate，value为EchartsVO 提升查询效率
Map<String, EchartsVO> dataMap = list.stream()
.collect(Collectors.toMap(EchartsVO::getOrderDate, vo -> vo, (a, b) -> a));

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/vo/EchartsVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/EchartsVO.java
View File

@ -1,7 +1,10 @@
package com.bonus.canteen.core.dataScreening.vo;
package com.bonus.canteen.core.screening.vo;
import lombok.Data;
/**
* @author 19814
*/
@Data
public class EchartsVO {
private String name;

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/dataScreening/vo/SingleModelVO.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/SingleModelVO.java
View File

@ -1,9 +1,12 @@
package com.bonus.canteen.core.dataScreening.vo;
package com.bonus.canteen.core.screening.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author 19814
*/
@Data
public class SingleModelVO {
private BigDecimal num;

18
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/DataScreening/DataScreeningMapper.xml → bonus-modules/bonus-smart-canteen/src/main/resources/mapper/screening/DataScreeningMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.dataScreening.mapper.DataScreeningMapper">
<mapper namespace="com.bonus.canteen.core.screening.mapper.DataScreeningMapper">
<select id="selectTurnover" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
<select id="selectTurnover" resultType="com.bonus.canteen.core.screening.vo.SingleModelVO">
select
IFNULL(sum( real_amount ),0) AS num
from order_info
@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</choose>
</if>
</select>
<select id="selectOrder" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
<select id="selectOrder" resultType="com.bonus.canteen.core.screening.vo.SingleModelVO">
select
IFNULL(count( 1 ),0) AS num
from order_info
@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</choose>
</if>
</select>
<select id="selectPerson" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
<select id="selectPerson" resultType="com.bonus.canteen.core.screening.vo.SingleModelVO">
select
count( DISTINCT user_id ) AS num
from order_info
@ -52,14 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</choose>
</if>
</select>
<select id="selectDish" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
<select id="selectDish" resultType="com.bonus.canteen.core.screening.vo.SingleModelVO">
select
count( DISTINCT mrd2.dishes_id ) AS num
from cook_recipe_detail mrd
left join cook_recipe_dishes mrd2 on mrd.recipe_detail_id = mrd2.recipe_detail_id
where mrd.apply_date = #{date} and mrd.detail_type = '2'
</select>
<select id="getCanteenOrdersAndSalesTrends" resultType="com.bonus.canteen.core.dataScreening.vo.EchartsVO">
<select id="getCanteenOrdersAndSalesTrends" resultType="com.bonus.canteen.core.screening.vo.EchartsVO">
SELECT
IFNULL( count( 1 ), 0 ) AS orderValue,
IFNULL(sum( real_amount ),0) AS salesValue,
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by order_date
</select>
<select id="getSupermarketOrderAndSalesTrend"
resultType="com.bonus.canteen.core.dataScreening.vo.EchartsVO">
resultType="com.bonus.canteen.core.screening.vo.EchartsVO">
SELECT
IFNULL( count( 1 ), 0 ) AS orderValue,
IFNULL(sum( real_amount ),0) AS salesValue,
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY order_date
order by order_date
</select>
<select id="getThisMonthDishSalesRanking" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
<select id="getThisMonthDishSalesRanking" resultType="com.bonus.canteen.core.screening.vo.SingleModelVO">
SELECT
sum(od.quantity) AS num,
md.dishes_name as name
@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by od.goods_id
order by num desc
</select>
<select id="selectOrderByDate" resultType="com.bonus.canteen.core.dataScreening.vo.SingleModelVO">
<select id="selectOrderByDate" resultType="com.bonus.canteen.core.screening.vo.SingleModelVO">
select
IFNULL(count( 1 ),0) AS num
from order_info