From 6e492d4d16efff769c2928109fb6a085fcad948d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 15 六月 2026 08:55:01 +0800
Subject: [PATCH] feat:付款合同编号不存在时错误提示
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java | 54 +++++++---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java | 9 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java | 2
platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml | 38 +++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ProductQueryDTO.java | 14 ++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Demo.java | 34 +++++-
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductTreeVo.java | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 26 +++--
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java | 8 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java | 8 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 12 ++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ProductMapper.java | 6 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java | 21 ++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PlanSubjectMatter.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java | 2
17 files changed, 198 insertions(+), 46 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ProductQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ProductQueryDTO.java
new file mode 100644
index 0000000..247dc2d
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ProductQueryDTO.java
@@ -0,0 +1,14 @@
+package com.by4cloud.platformx.business.dto;
+
+import lombok.Data;
+
+@Data
+public class ProductQueryDTO {
+
+ private String productName;
+
+ private String contractCategory;
+
+ private String parentId;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
index 8797049..23a58e1 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
@@ -9,7 +9,7 @@
import org.hibernate.annotations.Comment;
/**
- * @author wjli
+ * @author
* @description
* @date 2026/4/29 10:51
**/
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Demo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Demo.java
index dc3dc18..91fd3c9 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Demo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Demo.java
@@ -4,14 +4,14 @@
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Transient;
+import jakarta.persistence.*;
import lombok.Data;
+import org.hibernate.annotations.Comment;
import org.hibernate.annotations.Table;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -22,9 +22,11 @@
@Entity
@Table(appliesTo = "demo", comment = "demo")
public class Demo extends BaseModel<Demo> {
- @Schema(description = "濮撳悕")
- @Column(columnDefinition="VARCHAR(64) comment '濮撳悕'")
+
+ @Comment("濮撳悕")
+ @Column(name="name",length = 255)
private String name;
+
@Schema(description = "涓撲笟")
@Column(columnDefinition="VARCHAR(64) comment '涓撲笟'")
private String jo;
@@ -49,5 +51,27 @@
@Schema(description = "test")
private String test;
+ @Comment("瀛楃涓�")
+ @Column(name="str",length = 64)
+ private String str;
+
+ @Comment("long绫诲瀷")
+ @Column(name="big_integer",length = 64)
+ private Long bigInteger;
+
+ @Comment("bigDecimal")
+ @Column(name="big_decimal",precision=10, scale=2)
+ private BigDecimal bigDecimal;
+
+ @Comment("date")
+ @Temporal(TemporalType.DATE)
+ private Date date;
+
+ @Comment("timestamp")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date timestamp;
+
+ @Comment("bool")
+ private Boolean bool;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PlanSubjectMatter.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PlanSubjectMatter.java
index fae3bd3..a1a7e8b 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PlanSubjectMatter.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PlanSubjectMatter.java
@@ -9,7 +9,7 @@
import org.hibernate.annotations.Comment;
/**
- * @author wjli
+ * @author
* @description鎺掍骇璁″垝鏍囩殑鐗�
* @date 2026/4/29 10:51
**/
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
index f38ec7e..10d9844 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
@@ -8,6 +8,7 @@
import jakarta.persistence.Transient;
import lombok.Data;
+
import java.util.List;
/**
@@ -69,4 +70,11 @@
@Transient
@TableField(exist = false)
private List<Product> children;
+
+ /**
+ * 鏍囩殑鐗�
+ */
+ @Transient
+ @TableField(exist = false)
+ private Integer childNum;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
index 44ff6af..1ce06d0 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
@@ -15,7 +15,7 @@
import java.util.List;
/**
- * @author wjli
+ * @author
* @description
* @date 2026/4/29 10:51
**/
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
index a81440f..fe652b1 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
@@ -9,7 +9,7 @@
import org.hibernate.annotations.Comment;
/**
- * @author wjli
+ * @author
* @description
* @date 2026/4/29 10:51
**/
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java
new file mode 100644
index 0000000..8ea78d3
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductSelectVo.java
@@ -0,0 +1,21 @@
+package com.by4cloud.platformx.business.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ProductSelectVo {
+
+ private Long id;
+
+ @Schema(description = "浜у搧鍚嶇О")
+ private String productName;
+
+ private String productType;
+
+ private String erpCode;
+
+ private Long parentId;
+
+ private Integer childNum;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductTreeVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductTreeVo.java
index 9a2bed2..43900e3 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductTreeVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ProductTreeVo.java
@@ -11,6 +11,10 @@
@Schema(description = "浜у搧鍚嶇О")
private String productName;
+ private String productType;
+
+ private String erpCode;
+
private Long parentId;
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java
index 5bd0759..41db2a9 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java
@@ -130,4 +130,12 @@
public R syncPaymentRecepit(){
return paymentConfirmService.syncPaymentRecepit();
}
+
+ /**
+ * 涓氬姟绫诲瀷
+ */
+ @GetMapping("queryAllBusinessType")
+ public R queryAllBusinessType(){
+ return paymentConfirmService.queryAllBusinessType();
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
index d3c0ffa..bcea39f 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
@@ -24,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -80,25 +82,28 @@
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/list" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
- @Inner(value = false)
public R getProductList(@ParameterObject Product product) {
return R.ok(productService.getProductList(product));
}
/**
* 鍒嗛〉鏌ヨ
- * @param product 浜у搧淇℃伅
+ * @param queryDTO 浜у搧淇℃伅
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/listByParentId" )
- @PreAuthorize("@pms.hasPermission('business_product_view')" )
- //@Inner(value = false)
- public R getProductListByParentId(@ParameterObject Product product) {
- LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
- wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
- return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+ public R getProductListByParentId(@ParameterObject ProductQueryDTO queryDTO) {
+// LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+// wrapper.like(StrUtil.isNotEmpty(queryDTO.getProductName()),Product::getProductName,queryDTO.getProductName());
+// wrapper.eq(StrUtil.isNotEmpty(queryDTO.getParentId()),Product::getParentId,queryDTO.getParentId());
+// if (StrUtil.isNotEmpty(queryDTO.getContractCategory())&&StrUtil.equals(queryDTO.getContractCategory(), "water_house")){
+// String[] erpCodes = new String[]{"鎴跨绉熻祦","dianli","water"};
+// wrapper.in(Product::getErpCode,erpCodes);
+// return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+// }
+// return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+ return productService.getProductListByParentId(queryDTO);
}
/**
@@ -108,10 +113,9 @@
*/
@Operation(summary = "灞傜骇鏌ヨ" , description = "灞傜骇鏌ヨ" )
@GetMapping("/treeList" )
- //@PreAuthorize("@pms.hasPermission('business_product_view')" )
@Inner(value = false)
public R getNewsCategoryTree(@ParameterObject Product product) {
- return R.ok(productService.treeList(product.getParentId(), product.getProductName()));
+ return R.ok(productService.treeList());
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ProductMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ProductMapper.java
index 134671c..c2c35c2 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ProductMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ProductMapper.java
@@ -1,5 +1,7 @@
package com.by4cloud.platformx.business.mapper;
+import com.by4cloud.platformx.business.dto.ProductQueryDTO;
+import com.by4cloud.platformx.business.vo.ProductSelectVo;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import com.by4cloud.platformx.business.entity.Product;
@@ -12,5 +14,7 @@
public interface ProductMapper extends PlatformxBaseMapper<Product> {
- List<Product> getProductListByScope(@Param("product") Product product, DataScope comp_id);
+ List<ProductSelectVo> getProductListByScope(@Param("product") Product product, DataScope comp_id);
+
+ List<ProductSelectVo> getProductListByParentId(@Param("queryDTO") ProductQueryDTO queryDTO,@Param("erpCodes") List<String> erpCodes, DataScope comp_id);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java
index 79d5a13..09a7c82 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java
@@ -15,4 +15,6 @@
String getAccessToken(String accessToken);
void saveBipRequestRecord(JSONObject params,String methodName, String result);
+
+ R queryAllBusinessType();
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
index 476912f..0081475 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
@@ -1,8 +1,10 @@
package com.by4cloud.platformx.business.service;
import cn.hutool.core.lang.tree.Tree;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.entity.Product;
+import com.by4cloud.platformx.business.vo.ProductSelectVo;
+import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.IIService;
@@ -10,8 +12,9 @@
public interface ProductService extends IIService<Product> {
- List<Tree<Long>> treeList(Long parentId, String productName);
+ List<Tree<Long>> treeList();
- List<Product> getProductList(Product product);
+ List<ProductSelectVo> getProductList(Product product);
+ R getProductListByParentId(ProductQueryDTO queryDTO);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
index f01f00e..02ec8d9 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
@@ -34,6 +34,7 @@
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 鏀舵纭
@@ -73,6 +74,9 @@
public R add(PaymentConfirmAddDTO addDTO) {
if (StrUtil.isNotBlank(addDTO.getContractNo())) {
Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
+ if (ObjUtil.isNull(contract)) {
+ return R.failed("鍚堝悓鏌ヨ澶辫触锛岃妫�鏌ュ悎鍚岀紪鍙�");
+ }
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
.eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
.eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
@@ -194,7 +198,7 @@
entity.setBusGuestId(customer.getId());
entity.setBusGuestName(customer.getRegisterName());
- entity.setBusinessType("");
+ entity.setBusinessType("閫�娆�");
entity.setTransationAmount(addDTO.getTransationAmount());
BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
if (newtotal.compareTo(new BigDecimal("0")) > 0) {
@@ -839,4 +843,10 @@
}
baseMapper.insert(entity);
}
+
+ @Override
+ public R queryAllBusinessType() {
+ return R.ok(baseMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery().select(PaymentConfirm::getBusinessType).isNotNull(PaymentConfirm::getBusinessType)
+ .groupBy(PaymentConfirm::getBusinessType)).stream().map(PaymentConfirm::getBusinessType).collect(Collectors.toList()));
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
index 1f9588f..86ae44f 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
@@ -5,13 +5,15 @@
import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.entity.Product;
+import com.by4cloud.platformx.business.entity.TaxCode;
import com.by4cloud.platformx.business.mapper.ProductMapper;
import com.by4cloud.platformx.business.service.ProductService;
+import com.by4cloud.platformx.business.vo.ProductSelectVo;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
@@ -20,10 +22,10 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -36,30 +38,31 @@
@Service
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
@Override
- public List<Tree<Long>> treeList(Long parentId, String productName) {
- Long parent = parentId == null ? 0l : parentId;
-
+ public List<Tree<Long>> treeList() {
List<TreeNode<Long>> collect = baseMapper
.selectListByScope(Wrappers.<Product>lambdaQuery()
- .like(StrUtil.isNotBlank(productName), Product::getProductName, productName)
.orderByAsc(Product::getCreateTime), DataScope.of("comp_id"))
.stream().map(getNodeFunction()).collect(Collectors.toList());
// 妯＄硦鏌ヨ 涓嶇粍瑁呮爲缁撴瀯 鐩存帴杩斿洖 琛ㄦ牸鏂逛究缂栬緫
- if (StrUtil.isNotBlank(productName)) {
- return collect.stream().map(node -> {
- Tree<Long> tree = new Tree<>();
- tree.putAll(node.getExtra());
- BeanUtils.copyProperties(node, tree);
- return tree;
- }).collect(Collectors.toList());
- }
-
- return TreeUtil.build(collect, parent);
+// if (StrUtil.isNotBlank(productName)) {
+// return collect.stream().map(node -> {
+// Tree<Long> tree = new Tree<>();
+// tree.putAll(node.getExtra());
+// BeanUtils.copyProperties(node, tree);
+// return tree;
+// }).collect(Collectors.toList());
+// }
+ TreeNode<Long> parent = new TreeNode<>();
+ parent.setId(0L);
+ parent.setName("鐩綍");
+ parent.setParentId(-1L);
+ collect.add(parent);
+ return TreeUtil.build(collect, 0L);
}
@Override
- public List<Product> getProductList(Product product) {
+ public List<ProductSelectVo> getProductList(Product product) {
return baseMapper.getProductListByScope(product,DataScope.of("comp_id"));
}
@@ -90,4 +93,17 @@
return node;
};
}
+
+ @Override
+ public R getProductListByParentId(ProductQueryDTO queryDTO) {
+ String[] erpCodes = new String[]{"鎴跨绉熻祦","dianli","water"};
+// MPJLambdaWrapper<Product> wrapper = new MPJLambdaWrapper<Product>()
+// .selectAs("( SELECT count(1) FROM product t1 WHERE t1.parent_id = t.id )",Product::getChildNum)
+// .selectAll(Product.class)
+// .like(StrUtil.isNotEmpty(queryDTO.getProductName()),Product::getProductName,queryDTO.getProductName())
+// .eq(StrUtil.isNotEmpty(queryDTO.getParentId()),Product::getParentId,queryDTO.getParentId())
+// .in(StrUtil.isNotEmpty(queryDTO.getContractCategory())&&StrUtil.equals(queryDTO.getContractCategory(), "water_house"),
+// Product::getErpCode,erpCodes);
+ return R.ok(baseMapper.getProductListByParentId(queryDTO, Arrays.asList(erpCodes),DataScope.of("comp_id")));
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
index b3cfb0d..9fb6ef8 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
@@ -16,7 +16,7 @@
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
- <select id="getProductListByScope" resultType="com.by4cloud.platformx.business.entity.Product">
+ <select id="getProductListByScope" resultType="com.by4cloud.platformx.business.vo.ProductSelectVo">
SELECT
t.id,
t.product_name,
@@ -42,6 +42,40 @@
</if>
AND (
NOT EXISTS ( SELECT 1 FROM product t1 WHERE t1.parent_id = t.id ))
- limit 30
+ </select>
+ <select id="getProductListByParentId" resultType="com.by4cloud.platformx.business.vo.ProductSelectVo">
+ SELECT
+ t.id,
+ t.product_name,
+ t.main_code,
+ t.erp_code,
+ t.product_type,
+ t.tax_rate,
+ t.tax_class,
+ t.tax_code,
+ t.parent_id,
+ t.create_by,
+ t.update_by,
+ t.create_time,
+ t.update_time,
+ t.del_flag,
+ t.comp_id ,
+ ( SELECT count( 1 ) FROM product t1 WHERE t1.parent_id = t.id ) AS childNum
+ FROM
+ product t
+ WHERE
+ del_flag = '0'
+ <if test="queryDTO.productName !=null and queryDTO.productName !=''">
+ and t.product_name LIKE CONCAT('%', #{queryDTO.productName}, '%')
+ </if>
+ <if test="queryDTO.parentId !=null ">
+ and t.parent_id = #{queryDTO.parentId}
+ </if>
+ <if test="queryDTO.contractCategory !=null and queryDTO.contractCategory !='' and queryDTO.contractCategory=='water_house'">
+ and t.erp_code in
+ <foreach collection="erpCodes" item="erp" open="(" separator="," close=")">
+ #{erp}
+ </foreach>
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1