From f9d81769fb35d2fea8fb0da9162a39de4208b337 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 01 七月 2024 08:43:09 +0800
Subject: [PATCH] 模型节点有虚框不能保存 表决数量要小于进线
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 cf4c438..5bb44b6 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
@@ -42,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() {
@@ -61,7 +68,9 @@
}
public List<ProductImg> getProduct(Long productId) {
- return baseDao.getProduct(productId);
+ XhProductModel model =this.get(productId);
+ Long parentId = model.getPid();
+ return baseDao.getProduct(productId,parentId);
}
public List<XhProductModel> getTaskProductList() {
--
Gitblit v1.9.1