客商、销售员、产品、排产计划后台部分字段和方法的调整

李白

2 天以前 dfcd8b37f532ef54b259c1e716e7a2660951ae57

客商、销售员、产品、排产计划后台部分字段和方法的调整

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java

@@ -43,8 +43,12 @@
    @Column(columnDefinition = "double default 0.00 comment '税率'")
    private Double taxRate;

    @Schema(description = "税收分类")
    @Column(columnDefinition = "VARCHAR(50) comment '税收分类'")
    private String taxClass;

    @Schema(description = "父ID")
    @Column(columnDefinition = "bigint comment '父ID'")
    @Column(columnDefinition = "bigint default 0 comment '父ID'")
    private Long parentId;

    /**

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java

@@ -43,19 +43,19 @@

    @Schema(description = "甲方id")
    @Column(columnDefinition = "bigint comment '甲方id'")
    private Long partyAId;
    private Long partyaid;

    @Schema(description = "甲方名称")
    @Column(columnDefinition = "VARCHAR(100) comment '甲方名称'")
    private String partyA;
    private String partya;

    @Schema(description = "乙方id")
    @Column(columnDefinition = "bigint comment '乙方id'")
    private Long partyBId;
    private Long partybid;

    @Schema(description = "乙方名称")
    @Column(columnDefinition = "VARCHAR(100) comment '乙方名称'")
    private String partyB;
    private String partyb;

    @Schema(description = "金额")
    @Column(columnDefinition = "double comment '金额'")
@@ -109,6 +109,12 @@
    @Column(columnDefinition = "datetime comment '审批时间'")
    private String approveTime;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "转成合同时间")
    @Column(columnDefinition = "datetime comment '转成合同时间'")
    private String contractTime;

    /**
     * 标的物
     */

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java

@@ -2,6 +2,7 @@

import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +49,9 @@
    @PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
    public R getBusinessCustomerPage(@ParameterObject Page page, @ParameterObject BusinessCustomer businessCustomer) {
        LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(businessCustomer.getIndustryId()!=null,BusinessCustomer::getIndustryId,businessCustomer.getIndustryId());
        wrapper.eq(businessCustomer.getAreaId()!=null,BusinessCustomer::getAreaId,businessCustomer.getAreaId());
        wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
        return R.ok(businessCustomerService.page(page, wrapper));
    }


 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java

@@ -2,6 +2,7 @@

import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,6 +50,10 @@
    @PreAuthorize("@pms.hasPermission('business_product_view')" )
    public R getProductPage(@ParameterObject Page page, @ParameterObject Product product) {
        LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
        wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
        wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode());
        wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
        return R.ok(productService.page(page, wrapper));
    }


 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java

@@ -2,6 +2,7 @@

import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +49,10 @@
    @PreAuthorize("@pms.hasPermission('business_productionPlan_view')" )
    public R getProductionPlanPage(@ParameterObject Page page, @ParameterObject ProductionPlan productionPlan) {
        LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
        wrapper.like(StrUtil.isNotEmpty(productionPlan.getProductionPlanName()),ProductionPlan::getProductionPlanName,productionPlan.getProductionPlanName());
        wrapper.eq(productionPlan.getPartyaid()!=null,ProductionPlan::getPartyaid,productionPlan.getPartyaid());
        wrapper.eq(productionPlan.getPartybid()!=null,ProductionPlan::getPartybid,productionPlan.getPartybid());
        wrapper.eq(productionPlan.getStatus()!=null,ProductionPlan::getStatus,productionPlan.getStatus());
        return R.ok(productionPlanService.page(page, wrapper));
    }


 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java

@@ -2,6 +2,7 @@

import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +49,8 @@
    @PreAuthorize("@pms.hasPermission('business_salesMan_view')" )
    public R getSalesManPage(@ParameterObject Page page, @ParameterObject SalesMan salesMan) {
        LambdaQueryWrapper<SalesMan> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(salesMan.getCustomerId()!=null,SalesMan::getCustomerId,salesMan.getCustomerId());
        wrapper.like(StrUtil.isNotEmpty(salesMan.getSalesName()),SalesMan::getSalesName,salesMan.getSalesName());
        return R.ok(salesManService.page(page, wrapper));
    }


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

@@ -57,7 +57,7 @@
            node.setId(product.getId());
            node.setName(product.getProductName());
            node.setParentId(product.getParentId());
            node.setWeight(product.getParentId());
            //node.setWeight(product.getParentId());
            // 扩展属性
            Map<String, Object> extra = new HashMap<>();
//            extra.put("picPath", category.getPicPath());
@@ -68,11 +68,11 @@

            // 适配 vue3
            Map<String, Object> meta = new HashMap<>();
            meta.put("title", product.getProductName());
            meta.put("icon", product.getPrice());
           /* meta.put("title", product.getProductName());
            meta.put("icon", product.getPrice());*/

            extra.put("meta", meta);
            node.setExtra(extra);
            //extra.put("meta", meta);
            //node.setExtra(extra);
            return node;
        };
    }