1.花材统计报表：增加父类名称

陶杰

2024-12-21 2630f6e2d847435930539f3fb2aaabcab922c3d9

1.花材统计报表：增加父类名称

 src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java

@@ -84,7 +84,8 @@
            objs[a++] = o.getLoginName(); // 注册手机号
            objs[a++] = o.getContactTel(); // 联系方式"
            objs[a++] = o.getStationName(); // 所属集货站
            objs[a++] = o.getCategoryName(); // 品类
//            objs[a++] = o.getCategoryName(); // 品类
            objs[a++] = o.getParentCategoryName(); // 品类
            objs[a++] = o.getFlowerName(); //商品名称
//            String dictValue = dictCacheClient.getDict("FLOWER_LEVEL", o.getFlowerLevel());
//            objs[a++] = dictValue; //等级

 src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java

@@ -51,7 +51,7 @@
    @ApiOperation(value = "花材统计-统计", notes = "花材统计统计")
    public ResponseEntity<ReturnDataDTO<FlowerMaterialStaticVO>> getFlowerMaterialStatis(@Validated FlowerMaterialDTO dto
    ) {
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerSaleStatisticVO.class));
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerMaterialStaticVO.class));
    }