liding
2025-05-08 2f0b6462dc65c54e5d1e6d480250e34401ccb077
客户档案完善
已修改6个文件
已删除4个文件
1201 ■■■■■ 文件已修改
doc/若依环境使用手册.docx 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/quartz.sql 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/ry_20250417.sql 701 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/controller/CustomerController.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/pojo/Customer.java 153 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/service/ICustomerService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/basic/CustomerMapper.xml 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
doc/ÈôÒÀ»·¾³Ê¹ÓÃÊÖ²á.docx
Binary files differ
pom.xml
@@ -32,7 +32,7 @@
        <jwt.version>0.9.1</jwt.version>
        <kaptcha.version>2.3.3</kaptcha.version>
        <swagger.version>3.0.0</swagger.version>
        <poi.version>4.1.2</poi.version>
        <poi.version>5.2.3</poi.version>
        <oshi.version>6.6.5</oshi.version>
        <velocity.version>2.3</velocity.version>
        <!-- override dependency version -->
sql/quartz.sql
ÎļþÒÑɾ³ý
sql/ry_20250417.sql
ÎļþÒÑɾ³ý
src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -28,18 +28,16 @@
 * @date 2025-05-07
 */
@RestController
@RequestMapping("/system/customer")
@RequestMapping("/basic/customer")
@AllArgsConstructor
public class CustomerController extends BaseController
{
public class CustomerController extends BaseController {
    private ICustomerService customerService;
    /**
     * æŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆåˆ—表
     */
    @GetMapping("/list")
    public TableDataInfo list(Customer customer)
    {
    public TableDataInfo list(Customer customer) {
        startPage();
        List<Customer> list = customerService.selectCustomerList(customer);
        return getDataTable(list);
@@ -50,9 +48,15 @@
     */
    @Log(title = "客户档案", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, Customer customer)
    {
        List<Customer> list = customerService.selectCustomerList(customer);
    public void export(HttpServletResponse response, Customer customer) {
        Long[] ids = customer.getIds();
        List<Customer> list;
        if (ids != null && ids.length > 0) {
            list = customerService.selectCustomerListByIds(ids);
        } else {
            list = customerService.selectCustomerList(customer);
        }
        ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
        util.exportExcel(response, list, "客户档案数据");
    }
@@ -61,8 +65,7 @@
     * èŽ·å–å®¢æˆ·æ¡£æ¡ˆè¯¦ç»†ä¿¡æ¯
     */
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(customerService.selectCustomerById(id));
    }
@@ -71,8 +74,7 @@
     */
    @Log(title = "客户档案", businessType = BusinessType.INSERT)
    @PostMapping  ("/addCustomer")
    public AjaxResult add(@RequestBody Customer customer)
    {
    public AjaxResult add(@RequestBody Customer customer) {
        return toAjax(customerService.insertCustomer(customer));
    }
@@ -80,9 +82,8 @@
     * ä¿®æ”¹å®¢æˆ·æ¡£æ¡ˆ
     */
    @Log(title = "客户档案", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody Customer customer)
    {
    @PutMapping ("/updateCustomer")
    public AjaxResult edit(@RequestBody Customer customer) {
        return toAjax(customerService.updateCustomer(customer));
    }
@@ -91,8 +92,7 @@
     */
    @Log(title = "客户档案", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(customerService.deleteCustomerByIds(ids));
    }
}
src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,14 +1,12 @@
package com.ruoyi.basic.pojo;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
 * å®¢æˆ·æ¡£æ¡ˆå¯¹è±¡ customer
@@ -18,148 +16,67 @@
 */
@TableName(value = "customer")
@Data
public class Customer extends BaseEntity
{
public class Customer implements Serializable {
    private static final long serialVersionUID = 1L;
    /** $column.columnComment */
    /**
     * åºå·
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /** å®¢æˆ·åç§° */
    /**
     * å®¢æˆ·åç§°
     */
    @Excel(name = "客户名称")
    private String customerName;
    /** çº³ç¨Žäººè¯†åˆ«å· */
    /**
     * çº³ç¨Žäººè¯†åˆ«å·
     */
    @Excel(name = "纳税人识别号")
    private String taxpayerIdentificationNumber;
    /** å…¬å¸åœ°å€ */
    /**
     * å…¬å¸åœ°å€
     */
    @Excel(name = "公司地址")
    private String companyAddress;
    /** å…¬å¸ç”µè¯ */
    /**
     * å…¬å¸ç”µè¯
     */
    @Excel(name = "公司电话")
    private String companyPhone;
    /** è”系人 */
    /**
     * è”系人
     */
    @Excel(name = "联系人")
    private String contactPerson;
    /** è”系电话 */
    /**
     * è”系电话
     */
    @Excel(name = "联系电话")
    private String contactPhone;
    /** ç»´æŠ¤äºº */
    /**
     * ç»´æŠ¤äºº
     */
    @Excel(name = "维护人")
    private String maintainer;
    /** ç»´æŠ¤æ—¶é—´ */
    /**
     * ç»´æŠ¤æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date maintenanceTime;
    public void setId(Long id)
    {
        this.id = id;
    }
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
    public Long getId()
    {
        return id;
    }
    public void setCustomerName(String customerName)
    {
        this.customerName = customerName;
    }
    public String getCustomerName()
    {
        return customerName;
    }
    public void setTaxpayerIdentificationNumber(String taxpayerIdentificationNumber)
    {
        this.taxpayerIdentificationNumber = taxpayerIdentificationNumber;
    }
    public String getTaxpayerIdentificationNumber()
    {
        return taxpayerIdentificationNumber;
    }
    public void setCompanyAddress(String companyAddress)
    {
        this.companyAddress = companyAddress;
    }
    public String getCompanyAddress()
    {
        return companyAddress;
    }
    public void setCompanyPhone(String companyPhone)
    {
        this.companyPhone = companyPhone;
    }
    public String getCompanyPhone()
    {
        return companyPhone;
    }
    public void setContactPerson(String contactPerson)
    {
        this.contactPerson = contactPerson;
    }
    public String getContactPerson()
    {
        return contactPerson;
    }
    public void setContactPhone(String contactPhone)
    {
        this.contactPhone = contactPhone;
    }
    public String getContactPhone()
    {
        return contactPhone;
    }
    public void setMaintainer(String maintainer)
    {
        this.maintainer = maintainer;
    }
    public String getMaintainer()
    {
        return maintainer;
    }
    public void setMaintenanceTime(Date maintenanceTime)
    {
        this.maintenanceTime = maintenanceTime;
    }
    public Date getMaintenanceTime()
    {
        return maintenanceTime;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("customerName", getCustomerName())
            .append("taxpayerIdentificationNumber", getTaxpayerIdentificationNumber())
            .append("companyAddress", getCompanyAddress())
            .append("companyPhone", getCompanyPhone())
            .append("contactPerson", getContactPerson())
            .append("contactPhone", getContactPhone())
            .append("maintainer", getMaintainer())
            .append("maintenanceTime", getMaintenanceTime())
            .toString();
    }
    @TableField(exist = false)
    private Long[] ids;
}
src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -52,11 +52,5 @@
     */
    int deleteCustomerByIds(Long[] ids);
    /**
     * åˆ é™¤å®¢æˆ·æ¡£æ¡ˆä¿¡æ¯
     *
     * @param id å®¢æˆ·æ¡£æ¡ˆä¸»é”®
     * @return ç»“æžœ
     */
    int deleteCustomerById(Long id);
    List<Customer> selectCustomerListByIds(Long[] ids);
}
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -7,9 +7,13 @@
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
@@ -21,6 +25,7 @@
 */
@Service
@AllArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
    private CustomerMapper customerMapper;
@@ -43,7 +48,12 @@
     */
    @Override
    public List<Customer> selectCustomerList(Customer customer) {
        return customerMapper.selectList(new LambdaQueryWrapper<>());
        LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
        if (customer.getCustomerName() != null && !customer.getCustomerName().isEmpty()) {
            queryWrapper.eq(Customer::getCustomerName, customer.getCustomerName());
        }
        List<Customer> customerList = customerMapper.selectList(queryWrapper);
        return customerList;
    }
    /**
@@ -54,6 +64,9 @@
     */
    @Override
    public int insertCustomer(Customer customer) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Integer tenantId = loginUser.getTenantId();
        customer.setTenantId(Long.valueOf(tenantId));
        return customerMapper.insert(customer);
    }
@@ -65,6 +78,9 @@
     */
    @Override
    public int updateCustomer(Customer customer) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Integer tenantId = loginUser.getTenantId();
        customer.setTenantId(Long.valueOf(tenantId));
        return customerMapper.updateById(customer);
    }
@@ -76,17 +92,14 @@
     */
    @Override
    public int deleteCustomerByIds(Long[] ids) {
        return customerMapper.deleteCustomerByIds(ids);
        List<Long> idList = Arrays.asList(ids);
        return customerMapper.deleteBatchIds(idList);
    }
    /**
     * åˆ é™¤å®¢æˆ·æ¡£æ¡ˆä¿¡æ¯
     *
     * @param id å®¢æˆ·æ¡£æ¡ˆä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteCustomerById(Long id) {
        return customerMapper.deleteById(id);
    public List<Customer> selectCustomerListByIds(Long[] ids) {
        LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(Customer::getId, Arrays.asList(ids));
        return customerMapper.selectList(queryWrapper);
    }
}
src/main/resources/application.yml
@@ -95,9 +95,8 @@
  # ä»¤ç‰Œå¯†é’¥
  secret: abcdefghijklmnopqrstuvwxyz
  # ä»¤ç‰Œæœ‰æ•ˆæœŸï¼ˆé»˜è®¤30分钟)
  expireTime: 30
  expireTime: 450
  
# MyBatis Plus配置
# MyBatis Plus配置
mybatis-plus:
  # æœç´¢æŒ‡å®šåŒ…别名   æ ¹æ®è‡ªå·±çš„项目来
@@ -120,7 +119,7 @@
# Swagger配置
swagger:
  # æ˜¯å¦å¼€å¯swagger
  enabled: true
  enabled: false
  # è¯·æ±‚前缀
  pathMapping: /dev-api
src/main/resources/mapper/basic/CustomerMapper.xml
ÎļþÒÑɾ³ý