ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
@@ -2,7 +2,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.domain. TBoard; import com.ruoyi.system.domain.TOrderMeal; @@ -75,6 +77,7 @@ /** * 添加 餐桌管理 */ @Log(title = "餐桌-添加餐桌", businessType = BusinessType.INSERT) @ApiOperation( value = "添加餐桌") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TBoard dto) { @@ -113,6 +116,7 @@ /** * 删除 餐桌 */ @Log(title = "餐桌-删除餐桌", businessType = BusinessType.DELETE) @ApiOperation( value = "删除餐桌") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -6,10 +6,12 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.hutool.core.io.resource.ClassPathResource; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.constant.OrderNumConstants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.WebUtils; import com.ruoyi.framework.web.service.TokenService; @@ -101,13 +103,14 @@ return AjaxResult.success(dataGeneratorService.pageList(query)); } @Log(title = "数据生成-数据生成删除", businessType = BusinessType.DELETE) @ApiOperation( value = "数据生成删除") @DeleteMapping(value = "/deleteById") public AjaxResult<String> deleteById(@RequestParam("id") Long id) { dataGeneratorService.removeById(id); return AjaxResult.success(); } @Log(title = "数据生成-数据覆盖", businessType = BusinessType.UPDATE) @ApiOperation( value = "数据覆盖") @GetMapping(value = "/dataCoverage") public AjaxResult<String> dataCoverage(@RequestParam(value = "id") Long id) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
@@ -4,8 +4,10 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.WebUtils; import com.ruoyi.framework.web.service.TokenService; @@ -153,7 +155,7 @@ } return AjaxResult.success(); } @Log(title = "餐饮订单-删除餐饮订单", businessType = BusinessType.DELETE) @ApiOperation( value = "删除餐饮订单") @GetMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
@@ -4,8 +4,10 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.WebUtils; import com.ruoyi.framework.web.service.TokenService; @@ -104,6 +106,7 @@ return AjaxResult.success(orderSaleVO); } @Log(title = "销售订单-删除销售订单", businessType = BusinessType.DELETE) @ApiOperation( value = "删除销售订单") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
@@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.domain.TOrderStock; import com.ruoyi.system.domain.TOrderStockGoods; @@ -104,6 +106,7 @@ /** * 删除进货单 */ @Log(title = "进货单-删除进货单", businessType = BusinessType.DELETE) @ApiOperation( value = "删除进货单") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
@@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.mysql.cj.xdevapi.Collection; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.domain.*; import com.ruoyi.system.dto.TShopDTO; @@ -152,6 +154,7 @@ /** * 删除店铺信息 */ @Log(title = "店铺信息-删除店铺信息", businessType = BusinessType.DELETE) @ApiOperation( value = "删除店铺信息") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
@@ -311,33 +311,35 @@ @Override public List<TOrderMealVO> exportOrderMeal(TOrderMealQuery query) { if(Objects.nonNull(query.getTimeType())){ LocalDateTime startTime = null; LocalDateTime endTime = null; switch (query.getTimeType()){ case 1: // 今日 startTime = DateUtils.getDayStart(LocalDateTime.now()); endTime = DateUtils.getDayEnd(LocalDateTime.now()); break; case 2: // 昨日 startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1)); endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1)); break; case 3: // 近7天 startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7)); endTime = DateUtils.getDayEnd(LocalDateTime.now()); break; case 4: // 近30天 startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30)); endTime = DateUtils.getDayEnd(LocalDateTime.now()); break; if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){ if(Objects.nonNull(query.getTimeType())){ LocalDateTime startTime = null; LocalDateTime endTime = null; switch (query.getTimeType()){ case 1: // 今日 startTime = DateUtils.getDayStart(LocalDateTime.now()); endTime = DateUtils.getDayEnd(LocalDateTime.now()); break; case 2: // 昨日 startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1)); endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1)); break; case 3: // 近7天 startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7)); endTime = DateUtils.getDayEnd(LocalDateTime.now()); break; case 4: // 近30天 startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30)); endTime = DateUtils.getDayEnd(LocalDateTime.now()); break; } query.setStartTime(DateUtils.localDateTimeToDate(startTime)); query.setEndTime(DateUtils.localDateTimeToDate(endTime)); } query.setStartTime(DateUtils.localDateTimeToDate(startTime)); query.setEndTime(DateUtils.localDateTimeToDate(endTime)); } List<TOrderMealVO> list = this.baseMapper.exportOrderMeal(query); List<Long> ids = list.stream().map(TOrderMealVO::getId).collect(Collectors.toList());
