Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

4 天以前 8e941a8eac3329725cdd59cfa2bf3482ccbf057a

 src/main/java/com/ruoyi/basic/controller/CustomerPrivateController.java

@@ -1,28 +1,21 @@
package com.ruoyi.basic.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.dto.CustomerPrivateDto;
import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.CustomerPrivate;
import com.ruoyi.basic.service.CustomerPrivatePoolService;
import com.ruoyi.basic.service.CustomerPrivateService;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

import static com.ruoyi.framework.web.domain.AjaxResult.success;

/**
 * <p>
@@ -33,6 +26,7 @@
 * @since 2026-04-17 10:39:09
 */
@RestController
@Api(tags = "客户（私海）档案")
@RequestMapping("/customerPrivate")
public class CustomerPrivateController {
    @Autowired
@@ -53,6 +47,17 @@
        return R.ok(customerPrivateService.delete(ids));
    }

    /**
     * 将私海客户扔回公海重新分配
     * @param ids
     * @return
     */
    @PostMapping("/throwCustomer")
    @ApiOperation("将私海客户扔回公海重新分配")
    public R throwCustomer(@RequestBody List<Long> ids) {
        return R.ok( customerPrivatePoolService.throwCustomer(ids));

    }

    /**
     * 导入客户档案