blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2022-02-22 85dce973eb29eb2372c76d5b95b30354da9c41c8 
 zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java


@@ -23,7 +23,6 @@


import com.matrix.system.hive.dao.SysShopInfoDao;


import com.matrix.system.hive.service.ShoppingGoodsService;


import com.matrix.system.hive.service.SysShopInfoService;


import org.apache.poi.ss.formula.functions.T;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.ui.ModelMap;


@@ -191,6 +190,7 @@


            }


        }


        shoppingGoods.setIsDel(ShoppingGoods.NORMAL);


        shoppingGoods.setStaus(Dictionary.BUSINESS_STATE_UP);


        List<ShoppingGoods> dataList = shoppingGoodsService.findInPage(shoppingGoods, pageVo);


        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, shoppingGoodsService.findTotal(shoppingGoods));


        return result;


@@ -411,7 +411,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<>();


@@ -429,6 +429,7 @@


                temp.add(item.getCateName());


                temp.add(item.getIsCourse());


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


                temp.add(item.getTimeLength());


                list.add(temp);


            }


        }