更新导出数据格式等

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -25,6 +25,7 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -858,15 +859,17 @@ public class GoodsController {
             return modelAndView;
         }
 	    PageInfo info = new PageInfo(1, JxlsExcelView.MAX_SIZE);
-        Page<Goods> productsGoods = goodsService.getPageDataOfBackground(info, goodsFilter);;
+        Page<Goods> productsGoods = goodsService.getPageDataOfBackground(info, goodsFilter);
         if (CollectionUtils.isNotEmpty(productsGoods.getContent())) {
             logger.info("产品导出结果 products: " + productsGoods.getContent().size());
         } else {
             logger.info("产品导出结果 products为空");
         }
+        FastDateFormat dateFormat = FastDateFormat.getInstance("yyyy年MM月dd日 HH:mm");
+        modelAndView.addObject("dateFormat", dateFormat);
         modelAndView.addObject("data", productsGoods.getContent());
         modelAndView.addObject("goodsService", goodsService);
-        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/goods", "优软商城--产品库列表"));
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/background", "优软商城--产品库列表"));
         session.setAttribute("loading", false);
         return modelAndView;
     }

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -352,6 +352,12 @@ public class Goods implements Serializable {
 	@Transient
 	private List<GoodsQtyPrice> prices;
 
+    /**
+     * 是否有分段价格
+     */
+	@Transient
+	private boolean piecewise;
+
 	//*************************************************************************
 	//* 价格区间信息
 	//*************************************************************************
@@ -1006,7 +1012,15 @@ public class Goods implements Serializable {
 		}
 	}
 
-	public static long getSerialVersionUID() {
+    public boolean isPiecewise() {
+        return piecewise;
+    }
+
+    public void setPiecewise(boolean piecewise) {
+        this.piecewise = piecewise;
+    }
+
+    public static long getSerialVersionUID() {
 		return serialVersionUID;
 	}
 

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3530,6 +3530,7 @@ public class GoodsServiceImpl implements GoodsService {
                 goods.setSelfSale(StringConstant.SALE_SELF);
             }
             goods.setFrozen(getFrozenCount(goods.getBatchCode()));
+            goods.setPiecewise(goods.getPrices().size() > 1 ? true : false);
         }
 		return page;
 	}