From 9f8ea84ddf839ace5e82512f33d63831435d058f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:53:46 +0800
Subject: [PATCH] 删除客户原有字段

---
 src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
index 0236b55..a5dcc83 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -12,7 +12,7 @@
 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 io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -41,10 +41,10 @@
      * 鏌ヨ瀹㈡埛璺熻繘鍒楄〃
      */
     @GetMapping("/list")
-    @ApiOperation("鏌ヨ瀹㈡埛璺熻繘鍒楄〃")
+    @Operation(summary = "鏌ヨ瀹㈡埛璺熻繘鍒楄〃")
     public IPage<CustomerFollowUp> list(Page<CustomerFollowUp> page, CustomerFollowUp customerFollowUp) {
         LambdaQueryWrapper<CustomerFollowUp> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(customerFollowUp.getCustomerPrivatePoolId() != null, CustomerFollowUp::getCustomerPrivatePoolId, customerFollowUp.getCustomerPrivatePoolId())
+        queryWrapper.eq(customerFollowUp.getCustomerId() != null, CustomerFollowUp::getCustomerId, customerFollowUp.getCustomerId())
                 .like(customerFollowUp.getFollowerUserName() != null, CustomerFollowUp::getFollowerUserName, customerFollowUp.getFollowerUserName())
                 .orderByDesc(CustomerFollowUp::getFollowUpTime);
         return customerFollowUpService.page(page, queryWrapper);
@@ -53,7 +53,7 @@
     /**
      * 鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅
      */
-    @ApiOperation("鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
+    @Operation(summary = "鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id) {
         return AjaxResult.success(customerFollowUpService.getFollowUpWithFiles(id));
@@ -63,7 +63,7 @@
      * 鏂板瀹㈡埛璺熻繘
      */
     @PostMapping("/add")
-    @ApiOperation("鏂板瀹㈡埛璺熻繘")
+    @Operation(summary = "鏂板瀹㈡埛璺熻繘")
     @Log(title = "瀹㈡埛璺熻繘-鏂板", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody CustomerFollowUp customerFollowUp) {
         return toAjax(customerFollowUpService.insertCustomerFollowUp(customerFollowUp));
@@ -73,7 +73,7 @@
      * 淇敼瀹㈡埛璺熻繘
      */
     @PutMapping("/edit")
-    @ApiOperation("淇敼瀹㈡埛璺熻繘")
+    @Operation(summary = "淇敼瀹㈡埛璺熻繘")
     @Log(title = "瀹㈡埛璺熻繘-淇敼", businessType = BusinessType.UPDATE)
     public AjaxResult edit(@RequestBody CustomerFollowUp customerFollowUp) {
         return toAjax(customerFollowUpService.updateCustomerFollowUp(customerFollowUp));
@@ -82,7 +82,7 @@
     /**
      * 涓婁紶璺熻繘闄勪欢
      */
-    @ApiOperation("涓婁紶璺熻繘闄勪欢")
+    @Operation(summary = "涓婁紶璺熻繘闄勪欢")
     @PostMapping("/upload/{followUpId}")
     @Log(title = "瀹㈡埛璺熻繘-涓婁紶闄勪欢", businessType = BusinessType.INSERT)
     public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
@@ -92,7 +92,7 @@
     /**
      * 涓婁紶璺熻繘闄勪欢锛堝鐢紝鏃營D锛�
      */
-    @ApiOperation("涓婁紶闄勪欢(澶嶇敤)")
+    @Operation(summary = "涓婁紶闄勪欢(澶嶇敤)")
     @PostMapping("/upload")
     @Log(title = "涓婁紶闄勪欢(澶嶇敤)", businessType = BusinessType.INSERT)
     public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
@@ -103,7 +103,7 @@
     /**
      * 鎵归噺鏌ヨ闄勪欢鍒楄〃
      */
-    @ApiOperation("鎵归噺鏌ヨ闄勪欢鍒楄〃")
+    @Operation(summary = "鎵归噺鏌ヨ闄勪欢鍒楄〃")
     @PostMapping("/file/list")
     public AjaxResult getFileList(@RequestBody List<Long> ids) {
         return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
@@ -112,7 +112,7 @@
     /**
      * 鍒犻櫎璺熻繘闄勪欢
      */
-    @ApiOperation("鍒犻櫎璺熻繘闄勪欢")
+    @Operation(summary = "鍒犻櫎璺熻繘闄勪欢")
     @DeleteMapping("/file/{fileId}")
     @Log(title = "瀹㈡埛璺熻繘-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
     public AjaxResult deleteFile(@PathVariable Integer fileId) {
@@ -123,7 +123,7 @@
     /**
      * 鍒犻櫎瀹㈡埛璺熻繘
      */
-    @ApiOperation("鍒犻櫎瀹㈡埛璺熻繘")
+    @Operation(summary = "鍒犻櫎瀹㈡埛璺熻繘")
     @DeleteMapping("/{id}")
     @Log(title = "瀹㈡埛璺熻繘-鍒犻櫎", businessType = BusinessType.DELETE)
     public AjaxResult remove(@PathVariable Integer id) {
@@ -133,7 +133,7 @@
     /**
      * 鏂板/鏇存柊鍥炶鎻愰啋
      */
-    @ApiOperation("鏂板/鏇存柊鍥炶鎻愰啋")
+    @Operation(summary = "鏂板/鏇存柊鍥炶鎻愰啋")
     @PostMapping("/return-visit")
     @Log(title = "鍥炶鎻愰啋-鏂板/鏇存柊", businessType = BusinessType.UPDATE)
     public AjaxResult saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
@@ -143,7 +143,7 @@
     /**
      * 鑾峰彇鍥炶鎻愰啋璇︽儏
      */
-    @ApiOperation("鑾峰彇鍥炶鎻愰啋璇︽儏")
+    @Operation(summary = "鑾峰彇鍥炶鎻愰啋璇︽儏")
     @GetMapping("/return-visit/{customerId}")
     public AjaxResult getReturnVisit(@PathVariable Integer customerId) {
         return AjaxResult.success(customerReturnVisitService.getByCustomerId(customerId));
@@ -152,7 +152,7 @@
     /**
      * 鏍囪鍥炶鎻愰啋宸茶
      */
-    @ApiOperation("鏍囪鍥炶鎻愰啋宸茶")
+    @Operation(summary = "鏍囪鍥炶鎻愰啋宸茶")
     @PutMapping("/return-visit/read/{id}")
     @Log(title = "鍥炶鎻愰啋-鏍囪宸茶", businessType = BusinessType.UPDATE)
     public AjaxResult markAsRead(@PathVariable Long id) {

--
Gitblit v1.9.3