From 14de446d42a23f8823f56ef79214e0d0d634adaa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 16:57:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 3d26445..6f293d4 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -30,7 +30,7 @@
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, CustomerVisits customerVisits){
+ public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
return AjaxResult.success(listPage);
}
@@ -39,12 +39,37 @@
@ApiOperation("瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CustomerVisits customerVisits){
+ public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
boolean save = customerVisitsService.save(customerVisits);
- if (save){
+ if (save) {
return AjaxResult.success("娣诲姞鎴愬姛");
}
return AjaxResult.error("娣诲姞澶辫触");
}
+ @Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
+ @ApiOperation("瀹㈡埛鎷滆-缂栬緫")
+ @PostMapping("update")
+ public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
+ boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
+ if (updateResult) {
+ return AjaxResult.success("缂栬緫鎴愬姛");
+ }
+ return AjaxResult.error("缂栬緫澶辫触");
+ }
+
+ @Log(title = "瀹㈡埛鎷滆-鍒犻櫎", businessType = BusinessType.DELETE)
+ @ApiOperation("瀹㈡埛鎷滆-鍒犻櫎")
+ @DeleteMapping("{customerId}")
+ public AjaxResult deleteCustomerVisit(@PathVariable Integer customerId) {
+ if (customerId == null) {
+ return AjaxResult.error("瀹㈡埛ID涓嶈兘涓虹┖");
+ }
+ boolean deleteResult = customerVisitsService.removeById(customerId);
+ if (deleteResult) {
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
+ return AjaxResult.error("鍒犻櫎澶辫触");
+ }
+
}
--
Gitblit v1.9.3