Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

2026-09-10 15:02:06 +08:00
parent 6d718320e6 9e99a4a6c2
commit 4f5ba43d28
20 changed files with 1810 additions and 737 deletions
@@ -4,6 +4,7 @@ import java.util.List;

 import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment;
 import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomerContact;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +59,7 @@ public class BmsCustomerController extends BaseController
    public void export(HttpServletResponse response, BmsCustomer bmsCustomer)
    {
        List<BmsCustomer> list = bmsCustomerService.selectBmsCustomerList(bmsCustomer);
-        ExcelUtil<BmsCustomer> util = new ExcelUtil<BmsCustomer>(BmsCustomer.class);
+        ExcelUtil<BmsCustomer> util = new ExcelUtil<>(BmsCustomer.class);
        util.exportExcel(response, list, "客户主数据");
    }

@@ -67,7 +68,7 @@ public class BmsCustomerController extends BaseController
     */
    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:query')")
    @GetMapping(value = "/{customerId}")
-    public AjaxResult getInfo(@PathVariable("customerId") String customerId)
+    public AjaxResult getInfo(@PathVariable("customerId") Long customerId)
    {
        return success(bmsCustomerService.selectBmsCustomerByCustomerId(customerId));
    }
@@ -100,7 +101,7 @@ public class BmsCustomerController extends BaseController
    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:remove')")
    @Log(title = "客户信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{customerIds}")
-    public AjaxResult remove(@PathVariable String[] customerIds)
+    public AjaxResult remove(@PathVariable Long[] customerIds)
    {
        return toAjax(bmsCustomerService.deleteBmsCustomerByCustomerIds(customerIds));
    }
@@ -167,4 +168,54 @@ public class BmsCustomerController extends BaseController
    {
        return toAjax(bmsCustomerService.deleteBmsCustomerCompanyByCompanyIds(companyIds));
    }
+
+    /**
+     * 查询客户联系人列表
+     */
+    @GetMapping("/contact/list")
+    public TableDataInfo contactList(BmsCustomerContact bmsCustomerContact)
+    {
+        startPage();
+        List<BmsCustomerContact> list = bmsCustomerService.selectBmsCustomerContactList(bmsCustomerContact);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取客户联系人详细信息
+     */
+    @GetMapping("/contact/{contactId}")
+    public AjaxResult getContactInfo(@PathVariable("contactId") Long contactId)
+    {
+        return success(bmsCustomerService.selectBmsCustomerContactByContactId(contactId));
+    }
+
+    /**
+     * 新增客户联系人
+     */
+    @Log(title = "客户联系人", businessType = BusinessType.INSERT)
+    @PostMapping("/contact")
+    public AjaxResult addContact(@RequestBody BmsCustomerContact bmsCustomerContact)
+    {
+        return toAjax(bmsCustomerService.insertBmsCustomerContact(bmsCustomerContact));
+    }
+
+    /**
+     * 修改客户联系人
+     */
+    @Log(title = "客户联系人", businessType = BusinessType.UPDATE)
+    @PutMapping("/contact")
+    public AjaxResult editContact(@RequestBody BmsCustomerContact bmsCustomerContact)
+    {
+        return toAjax(bmsCustomerService.updateBmsCustomerContact(bmsCustomerContact));
+    }
+
+    /**
+     * 删除客户联系人
+     */
+    @Log(title = "客户联系人", businessType = BusinessType.DELETE)
+    @DeleteMapping("/contact/{contactIds}")
+    public AjaxResult removeContact(@PathVariable Long[] contactIds)
+    {
+        return toAjax(bmsCustomerService.deleteBmsCustomerContactByContactIds(contactIds));
+    }
 }
@@ -5,6 +5,8 @@ import java.util.List;
 import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment;
 import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany;
 import com.ruoyi.customer.supplierinfo.domain.BmsSupplier;
+import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment;
+import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany;
 import com.ruoyi.customer.supplierinfo.service.IBmsSupplierService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +63,7 @@ public class BmsSupplierController extends BaseController
    /** 获取供应商详细信息 */
    @PreAuthorize("@ss.hasPermi('customersupplier:supplierinfo:query')")
    @GetMapping(value = "/{supplierId}")
-    public AjaxResult getInfo(@PathVariable("supplierId") String supplierId)
+    public AjaxResult getInfo(@PathVariable("supplierId") Long supplierId)
    {
        return success(bmsSupplierService.selectBmsSupplierBySupplierId(supplierId));
    }
@@ -88,26 +90,26 @@ public class BmsSupplierController extends BaseController
    @PreAuthorize("@ss.hasPermi('customersupplier:supplierinfo:remove')")
    @Log(title = "供应商信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{supplierIds}")
-    public AjaxResult remove(@PathVariable String[] supplierIds)
+    public AjaxResult remove(@PathVariable Long[] supplierIds)
    {
        return toAjax(bmsSupplierService.deleteBmsSupplierBySupplierIds(supplierIds));
    }

    /** 查看供应商附件列表（子表共用） */
    @GetMapping("/attachment/list")
-    public TableDataInfo attachmentList(BmsCustomerAttachment bmsCustomerAttachment)
+    public TableDataInfo attachmentList(BmsSupplierAttachment bmsSupplierAttachment)
    {
        startPage();
-        List<BmsCustomerAttachment> list = bmsSupplierService.selectBmsSupplierAttachmentList(bmsCustomerAttachment);
+        List<BmsSupplierAttachment> list = bmsSupplierService.selectBmsSupplierAttachmentList(bmsSupplierAttachment);
        return getDataTable(list);
    }

    /** 查看供应商公司主体列表（子表共用） */
    @GetMapping("/company/list")
-    public TableDataInfo companyList(BmsCustomerCompany bmsCustomerCompany)
+    public TableDataInfo companyList(BmsSupplierCompany bmsSupplierCompany)
    {
        startPage();
-        List<BmsCustomerCompany> list = bmsSupplierService.selectBmsSupplierCompanyList(bmsCustomerCompany);
+        List<BmsSupplierCompany> list = bmsSupplierService.selectBmsSupplierCompanyList(bmsSupplierCompany);
        return getDataTable(list);
    }
 }