src/main/java/com/ruoyi/sales/pojo/BusinessOpportunity.java

@@ -43,6 +43,21 @@
    @ApiModelProperty(value = "状态")
    private String status;

    @ApiModelProperty(value = "行业")
    private String industry;

    @ApiModelProperty(value = "信息化现状")
    private String informationState;

    @ApiModelProperty(value = "主营业务收入")
    private String mainBusinessRevenue;
    @ApiModelProperty(value = "客户规模")
    private String customerScale;
    @ApiModelProperty(value = "主营产品")
    private String mainProducts;



    @ApiModelProperty(value = "省份")
    private String province;


 src/main/java/com/ruoyi/sales/service/impl/BusinessOpportunityServiceImpl.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.sales.mapper.AreaMapper;
import com.ruoyi.sales.mapper.BusinessOpportunityMapper;
import com.ruoyi.sales.pojo.Area;
@@ -14,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;

/**
@@ -32,15 +35,29 @@

    @Override
    public IPage<BusinessOpportunity> listPage(Page page, BusinessOpportunity businessOpportunity) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        LambdaQueryWrapper<BusinessOpportunity> businessOpportunityLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(businessOpportunity != null){
            if(StringUtils.isNotEmpty(businessOpportunity.getCustomerName())){
                businessOpportunityLambdaQueryWrapper.like(BusinessOpportunity::getCustomerName,businessOpportunity.getCustomerName());
            }
            if(StringUtils.isNotEmpty(businessOpportunity.getCity())){
                businessOpportunityLambdaQueryWrapper.like(BusinessOpportunity::getCity,businessOpportunity.getCity());
            }
            if(StringUtils.isNotEmpty(businessOpportunity.getEntryDateStart()) && StringUtils.isNotEmpty(businessOpportunity.getEntryDateEnd())){
                businessOpportunityLambdaQueryWrapper.ge(BusinessOpportunity::getEntryDate,businessOpportunity.getEntryDateStart())
                        .le(BusinessOpportunity::getEntryDate,businessOpportunity.getEntryDateEnd());
            }
            if(StringUtils.isNotEmpty(businessOpportunity.getEntryPerson())){
                businessOpportunityLambdaQueryWrapper.like(BusinessOpportunity::getEntryPerson,businessOpportunity.getEntryPerson());
            }
            if(StringUtils.isNotEmpty(businessOpportunity.getStatus())){
                businessOpportunityLambdaQueryWrapper.eq(BusinessOpportunity::getStatus,businessOpportunity.getStatus());
            }
        }
        List<String> userNameList = Arrays.asList("王超楠","房添姝","缪海庆","管理员");
        if(!userNameList.contains(loginUser.getUsername())){
            businessOpportunityLambdaQueryWrapper.eq(BusinessOpportunity::getEntryPerson,loginUser.getNickName());
        }
        businessOpportunityLambdaQueryWrapper.orderByDesc(BusinessOpportunity::getEntryDate);
        return businessOpportunityMapper.selectPage(page,businessOpportunityLambdaQueryWrapper);