From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShoppingGoodsController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShoppingGoodsController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShoppingGoodsController.java
index e0e3f79..c22f83c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShoppingGoodsController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShoppingGoodsController.java
@@ -4,6 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelVersion;
@@ -66,8 +67,10 @@
@RequestMapping(value = "/showList")
public @ResponseBody
AjaxResult showList(ShoppingGoods shoppingGoods, PaginationVO pageVo) {
- pageVo.setOrder("desc");
- pageVo.setSort("createTime");
+ if(StringUtils.isBlank(pageVo.getSort())){
+ pageVo.setOrder("desc");
+ pageVo.setSort("createTime");
+ }
QueryUtil.setQueryLimitCom(shoppingGoods);
shoppingGoods.setIsDel(ShoppingGoods.NORMAL);
List<ShoppingGoods> dataList = shoppingGoodsService.findInPage(shoppingGoods, pageVo);
@@ -98,9 +101,6 @@
shoppingGoods.setAssembleGoods(assembleListGoods);
List<ShoppingGoodsAssemble> assembleListProj = shoppingGoodsAssembleDao.selectProjByShoppingGoodsId(shoppingGoods.getId());
shoppingGoods.setAssembleProj(assembleListProj);
- } else if (Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(shoppingGoods.getGoodType())) {
- List<ShoppingGoodsAssemble> assembleList = shoppingGoodsAssembleDao.selectAssembleShoppingGoodsByShoppingGoodsId(shoppingGoods.getId());
- shoppingGoods.setZongheCarGoods(assembleList);
}
@@ -129,9 +129,6 @@
// 返回充值卡编辑界面
WebUtil.getRequest().setAttribute("obj", shoppingGoods);
return "admin/hive-erp/products/money-card-form";
- } else if (shoppingGoods.getGoodType().equals(Dictionary.SHOPPING_GOODS_TYPE_ZHK)) {
- WebUtil.getRequest().setAttribute("obj", shoppingGoods);
- return "admin/hive-erp/products/zonghe-card-form";
}
--
Gitblit v1.9.1