From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
index 1e94694..3bbda0d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
@@ -1,15 +1,21 @@
package com.by4cloud.platformx.business.controller;
+import cn.hutool.core.bean.BeanUtil;
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;
+import com.by4cloud.platformx.business.entity.Product;
+import com.by4cloud.platformx.business.vo.BusinessCustomerSelectVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.business.service.BusinessCustomerService;
+import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -20,6 +26,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -38,6 +45,15 @@
private final BusinessCustomerService businessCustomerService;
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
@@ -48,11 +64,27 @@
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
public R getBusinessCustomerPage(@ParameterObject Page page, @ParameterObject BusinessCustomer businessCustomer) {
+
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ 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());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ wrapper.in(BusinessCustomer::getCompId, smjList);
+ wrapper.orderByDesc(BusinessCustomer::getCreateTime);
+ return R.ok(businessCustomerService.page(page, wrapper));
+ }
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));
+ wrapper.orderByDesc(BusinessCustomer::getCreateTime);
+ return R.ok(businessCustomerService.pageByScope(page, wrapper));
}
/**
@@ -64,8 +96,36 @@
@GetMapping("/list" )
@PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
public R getBusinessCustomerList(@ParameterObject BusinessCustomer businessCustomer) {
+
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ wrapper.in(BusinessCustomer::getCompId, smjList);
+ List<BusinessCustomer> businessCustomerList = businessCustomerService.list(wrapper);
+ if (CollUtil.isNotEmpty(businessCustomerList)){
+ List<BusinessCustomerSelectVo> voList = BeanUtil.copyToList(businessCustomerList, BusinessCustomerSelectVo.class);
+ if (voList.size()>1000){
+ return R.ok(voList.subList(0,1000));
+ }
+ return R.ok(voList);
+ }
+ }
LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
- return R.ok(businessCustomerService.list(wrapper));
+ wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
+ List<BusinessCustomer> businessCustomerList = businessCustomerService.listByScope(wrapper);
+ if (CollUtil.isNotEmpty(businessCustomerList)){
+ List<BusinessCustomerSelectVo> voList = BeanUtil.copyToList(businessCustomerList, BusinessCustomerSelectVo.class);
+ if (voList.size()>1000){
+ return R.ok(voList.subList(0,1000));
+ }
+ return R.ok(voList);
+ }
+ return R.ok();
}
/**
@@ -132,4 +192,23 @@
public List<BusinessCustomer> export(BusinessCustomer businessCustomer,Long[] ids) {
return businessCustomerService.list(Wrappers.lambdaQuery(businessCustomer).in(ArrayUtil.isNotEmpty(ids), BusinessCustomer::getId, ids));
}
+
+ /**
+ * 鍚屾涓绘暟鎹� 浼佷笟鍚嶇О 娉曚汉 涓夊悎涓�鐮� 閾惰淇℃伅
+ * @return R
+ */
+ @Inner(value = false)
+ @GetMapping("/syncMainBusCus/{compId}" )
+ public R syncMainBusCus(@PathVariable("compId")String compId) {
+ return R.ok(businessCustomerService.syncMainBusCus(compId));
+ }
+
+ /**
+ * 鍚屾涓绘暟鎹� 浼佷笟鍚嶇О 娉曚汉 涓夊悎涓�鐮� 閾惰淇℃伅
+ * @return R
+ */
+ @GetMapping("/queryMainBC/{companyName}" )
+ public R queryMainBC(@PathVariable("companyName")String companyName) {
+ return R.ok(businessCustomerService.queryMainBC(companyName));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1