parent: 822b96ee | patch | commit | show whitespace
jyy
2022-01-23 c381ee31e4bc8c186878ac0178164f3604516783 
Merge branch 'score_shop' into api_score_meger
1 files modified
3 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java 3 ●●●●● patch | view | raw | blame | history 
 zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java


@@ -435,7 +435,7 @@


        String title = "商品资料";


        orderSheet.setSheetName(title);


        orderSheet.setTitle(title);


        String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属"};


        String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属","时长"};


        orderSheet.setHeaders(header);


        List<ShoppingGoods> dataList = shoppingGoodsService.findAll(shoppingGoods);


        List<List<Object>> list = new ArrayList<>();


@@ -453,6 +453,7 @@


                temp.add(item.getCateName());


                temp.add(item.getIsCourse());


                temp.add(item.getHeadquarters() == 1 ? "总部产品" : "本店产品");


                temp.add(item.getTimeLength());


                list.add(temp);


            }


        }