xuhy
2024-10-25 6aa659f6cb7d3c86c87c4ab58be4220820c7326b
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -104,7 +104,7 @@
    @ApiOperation( value = "数据生成终止 shopId=店铺id type: 1=餐饮 2=进货")
    @GetMapping(value = "/stopGenerator")
    public AjaxResult<String> dataCoverage(@RequestParam(value = "shopId") Long shopId,
    public AjaxResult<String> stopGenerator(@RequestParam(value = "shopId") Long shopId,
                                           @RequestParam(value = "type") Integer type) {
        if(type == 1){
            redisCache.setCacheObject(OrderNumConstants.MEAL+"_"+shopId,shopId);
@@ -142,6 +142,7 @@
            BeanUtils.copyProperties(orderMealVO, tOrderMealExportExcel);
            tOrderMealExportExcel.setCreateStrTime(DateUtils.localDateToString(orderMealVO.getMealTime()));
            tOrderMealExportExcel.setGoodsList(orderMealVO.getGoodsList().stream().collect(Collectors.joining("\n")));
            tOrderMealExportExcel.setPersonCount(orderMealVO.getMealPerson());
            orderMeals.add(tOrderMealExportExcel);
        }
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderMealExportExcel.class, orderMeals);