feat:合同编号规则调整 出库编号规则调整

shiyunteng

2 天以前 96119ca3973d5ea643db6a87b6a23fe404ddb8cc

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java

@@ -3,20 +3,21 @@
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeUtil;
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.mapper.ProductMapper;
import com.by4cloud.platformx.business.service.ProductService;
import com.by4cloud.platformx.business.vo.ProductSelectVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import jakarta.validation.constraints.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.HashMap;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

@@ -29,32 +30,34 @@
@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"));
   }


   @NotNull
    private Function<Product, TreeNode<Long>> getNodeFunction() {
@@ -82,4 +85,21 @@
            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);
      List<ProductSelectVo> selectVos = baseMapper.getProductListByParentId(queryDTO, Arrays.asList(erpCodes),DataScope.of("comp_id"));
      if (selectVos.size()>2000){
         return R.ok(selectVos.subList(0,1999));
      }
      return R.ok(selectVos);
   }
}