blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-06-18 e423d56d730db1baed24f3f7dbbc4141038776b6 
 zq-erp/src/main/java/com/matrix/system/hive/action/OnlinebookingController.java


@@ -12,7 +12,7 @@


import com.matrix.system.hive.bean.SysShopInfo;


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


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


import com.matrix.system.hive.plugin.util.DateUtils;


import com.matrix.core.tools.DateUtil;


import com.matrix.system.hive.plugin.util.ExcelUtil;


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


import com.matrix.system.shopXcx.bean.ShopProduct;


@@ -135,14 +135,14 @@


            for(Onlinebooking obj:dataList){


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


               temp.add(obj.getVipInfo().getVipName());


               String strDate= DateUtils.dateToString(obj.getTime(), DateUtils.DATE_FORMAT_SS);


               String strDate= DateUtil.dateToString(obj.getTime(), DateUtil.DATE_FORMAT_SS);


               temp.add(strDate);


               temp.add(obj.getStatus());


               //时间转为字符串 


               temp.add(obj.getReason());


               temp.add(obj.getRemark());


               temp.add(obj.getShopName());


               String crtDate=DateUtils.dateToString(obj.getCreateTime(), DateUtils.DATE_FORMAT_SS);


               String crtDate=DateUtil.dateToString(obj.getCreateTime(), DateUtil.DATE_FORMAT_SS);


               temp.add(crtDate);


               list.add(temp);


            }