From 577e866c218a797770b73081586b66fd6a8f4e41 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:02:11 +0800
Subject: [PATCH] 测试调用python算法库
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index cee7108..96dd7ce 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -6,14 +6,10 @@
import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
-import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
-import com.zt.modules.sys.model.SysMenu;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
import java.util.List;
@@ -34,14 +30,6 @@
*/
public List<XhProductModel> page(QueryFilter queryFilter) {
List<XhProductModel> list = baseDao.getList(queryFilter.getQueryParams());
- for (XhProductModel productModel : list) {
- if (productModel.getProductType().equals("1")) {
- productModel.setDefaultImg(baseDao.getDefaultImg());
- if (productModel.getId() != null) {
- this.update(productModel);
- }
- }
- }
return list;
}
@@ -54,17 +42,24 @@
super.deleteLogic(ids);
}
- public List<XhProductModel> getAllTree() {
- List<XhProductModel> productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ public List<XhProductModel> getAllTree(Boolean showXdy) {
+ List<XhProductModel> productList;
+ if (showXdy) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ } else {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+
+ }
return TreeUtils.build(productList);
}
- public Integer getNo(Long pid) {
- if (baseDao.getNo(pid) == null) {
+ public Integer getNo(Long pid, String productType) {
+ if (baseDao.getNo(pid, productType) == null) {
return 0;
}
- return baseDao.getNo(pid);
+ return baseDao.getNo(pid,productType);
}
public List<XhProductModel> getProductList() {
@@ -75,4 +70,8 @@
public List<ProductImg> getProduct(Long productId) {
return baseDao.getProduct(productId);
}
+
+ public List<XhProductModel> getTaskProductList() {
+ return baseDao.getTaskProductList();
+ }
}
--
Gitblit v1.9.1