diff --git a/ad-distribute-starters/pom.xml b/ad-distribute-starters/pom.xml
index fe16103..01ece4c 100644
--- a/ad-distribute-starters/pom.xml
+++ b/ad-distribute-starters/pom.xml
@@ -13,6 +13,8 @@
ad-distribute-starters
+
+ ad-distribute-starter-easyexcel
ad-distribute-starter-redis
ad-distribute-starter-swagger
ad-distribute-starter-file
@@ -29,4 +31,4 @@
-
\ No newline at end of file
+
diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java
index 654798e..f431f85 100644
--- a/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java
+++ b/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java
@@ -1,10 +1,16 @@
package com.baiye.modules.distribute.controller;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.baiye.common.excel.annotation.ResponseExcel;
+import com.baiye.constant.DefaultNumberConstants;
import com.baiye.domain.PageParam;
import com.baiye.domain.PageResult;
+import com.baiye.modules.distribute.converter.CustomConverter;
import com.baiye.modules.distribute.dto.ChangeCustomDTO;
+import com.baiye.modules.distribute.dto.CreateCustomDTO;
import com.baiye.modules.distribute.dto.CustomDTO;
+import com.baiye.modules.distribute.entity.CustomEntity;
import com.baiye.modules.distribute.qo.CustomQo;
import com.baiye.modules.distribute.service.CustomService;
import com.baiye.modules.distribute.vo.CustomVO;
@@ -22,6 +28,10 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
@RequiredArgsConstructor
@RestController
@Tag(name = "客户管理")
@@ -37,25 +47,7 @@ public class CustomController {
@GetMapping("/page")
@Operation(summary = "分页查询客户信息")
public R> queryPage(@Validated PageParam pageParam, CustomQo qo) {
- Integer salesmanType = qo.getSalesmanType();
- // 查询属于自己的信息
- if (!adminUserChecker.isAdminUser(sysUserService.findById
- (SecurityUtils.getCurrentUserId()))) {
- qo.setCompanyId(SecurityUtils.getWhichUserId());
- }
- if (ObjectUtil.isNotNull(salesmanType)) {
- if (salesmanType > 1) {
- qo.setGreaterStatus(0);
- }
- if (salesmanType == 1) {
- // 查询当前用户自己的
- qo.setSalesmanType(null);
- qo.setCreateBy(SecurityUtils.getCurrentUserId());
- }
- if (salesmanType == 3) {
- qo.setReviewUserId(SecurityUtils.getCurrentUserId());
- }
- }
+ setQueryQo(qo);
return R.ok(customService.queryPage(pageParam, qo));
}
@@ -65,6 +57,16 @@ public class CustomController {
return customService.add(customDTO) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败");
}
+
+ @PostMapping("/manual/create")
+ @Operation(summary = "手动创建线索", description = "新增客户")
+ public R