fix: 修复客户档案的导入、新增、编辑的的数据验证

gongchunyi

6 小时以前 ff41f9a13e981b543c114336058150c940110393

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

@@ -2,6 +2,8 @@

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.CustomerImportDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -9,7 +11,6 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -33,7 +34,7 @@
     * 查询客户档案列表
     */
    @GetMapping("/list")
    public IPage<Customer> list(Page<Customer> page, Customer customer) {
    public IPage<CustomerDto> list(Page<Customer> page, Customer customer) {
        return customerService.selectCustomerList(page, customer);
    }

@@ -50,14 +51,14 @@
        } else {
            list = customerService.selectCustomerLists(customer);
        }
        ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
        ExcelUtil<Customer> util = new ExcelUtil<>(Customer.class);
        util.exportExcel(response, list, "客户档案数据");
    }

    @PostMapping("/downloadTemplate")
    @Log(title = "客户档案-下载模板", businessType = BusinessType.EXPORT)
    public void downloadTemplate(HttpServletResponse response) {
        ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
        ExcelUtil<CustomerImportDto> util = new ExcelUtil<>(CustomerImportDto.class);
        util.importTemplateExcel(response, "客户档案模板");
    }

@@ -68,8 +69,8 @@
    @Log(title = "客户档案", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {

        return customerService.importData(file);
        customerService.importData(file);
        return AjaxResult.success();
    }

    /**
@@ -118,10 +119,4 @@
        return customerService.customerList(customer);
    }

    @GetMapping("/regions")
    @ApiOperation("获取客户地区")
    public AjaxResult getRegions() {
        List<String> regionsList = customerService.regionsList();
        return AjaxResult.success(regionsList);
    }
}