ソースを参照

更新后台产品列表查询标准判断方法,更新导出数量限制

hejq 7 年 前
コミット
34bd171130

+ 5 - 0
src/main/java/com/uas/platform/b2c/core/support/view/JxlsExcelView.java

@@ -33,6 +33,11 @@ public class JxlsExcelView extends AbstractExcelView {
 	 */
 	public final static int MAX_SIZE = 50000;
 
+    /**
+     * 管理后台goods最大导出行
+     */
+	public final static int GOODS_MAX_SIZE = 1200;
+
     /**
      * 文件名
      */

+ 5 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/constant/StringConstant.java

@@ -56,4 +56,9 @@ public class StringConstant {
      * 应用来源
      */
     public static final String SOURCE = "MALL";
+
+    /**
+     * 空字符串
+     */
+    public static final String BLANK = " ";
 }

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

@@ -858,7 +858,7 @@ public class GoodsController {
         if (!modelAndView.isEmpty()) {
             return modelAndView;
         }
-        PageInfo info = new PageInfo(params);
+        PageInfo info = new PageInfo(1, JxlsExcelView.GOODS_MAX_SIZE);
         Page<Goods> productsGoods = goodsService.getPageDataOfBackground(info, goodsFilter);
         if (CollectionUtils.isNotEmpty(productsGoods.getContent())) {
             logger.info("产品导出结果 products: " + productsGoods.getContent().size());

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

@@ -75,7 +75,7 @@ public class Goods implements Serializable {
 	 * 对应的器件uuid
 	 */
 	@Column(name = "cmp_uuid")
-	private String uuid;
+	private String uuid = "";
 
 	/**
 	 * 是否已在售

+ 4 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3691,9 +3691,11 @@ public class GoodsServiceImpl implements GoodsService {
         }
         if (goodsFilter.getStandard() != null) {
             if (goodsFilter.getStandard()) {
-                info.expression(PredicateUtils.isNotNull("uuid"));
+                info.expression(PredicateUtils.and(PredicateUtils.isNotNull("uuid"),
+                        PredicateUtils.ne("uuid", StringConstant.BLANK, true)));
             } else {
-                info.expression(PredicateUtils.isNull("uuid"));
+                info.expression(PredicateUtils.or(PredicateUtils.isNull("uuid"),
+                        PredicateUtils.eq("uuid", StringConstant.BLANK, true)));
             }
         }
         if (goodsFilter.getAudited() != null) {