From f569e2257372a2f940aace9ad151fd758196eb9a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 13 六月 2026 14:34:42 +0800
Subject: [PATCH] 修改客户，销售，协同，报价，质量
---
src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 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..a9a1651 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -8,11 +8,14 @@
import com.ruoyi.basic.pojo.CustomerReturnVisit;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerReturnVisitService;
+import com.ruoyi.basic.vo.CustomerFollowUpExportVo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
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 jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -41,10 +44,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 +56,7 @@
/**
* 鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
+ @Operation(summary = "鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id) {
return AjaxResult.success(customerFollowUpService.getFollowUpWithFiles(id));
@@ -63,7 +66,7 @@
* 鏂板瀹㈡埛璺熻繘
*/
@PostMapping("/add")
- @ApiOperation("鏂板瀹㈡埛璺熻繘")
+ @Operation(summary = "鏂板瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody CustomerFollowUp customerFollowUp) {
return toAjax(customerFollowUpService.insertCustomerFollowUp(customerFollowUp));
@@ -73,7 +76,7 @@
* 淇敼瀹㈡埛璺熻繘
*/
@PutMapping("/edit")
- @ApiOperation("淇敼瀹㈡埛璺熻繘")
+ @Operation(summary = "淇敼瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody CustomerFollowUp customerFollowUp) {
return toAjax(customerFollowUpService.updateCustomerFollowUp(customerFollowUp));
@@ -82,7 +85,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 +95,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 +106,7 @@
/**
* 鎵归噺鏌ヨ闄勪欢鍒楄〃
*/
- @ApiOperation("鎵归噺鏌ヨ闄勪欢鍒楄〃")
+ @Operation(summary = "鎵归噺鏌ヨ闄勪欢鍒楄〃")
@PostMapping("/file/list")
public AjaxResult getFileList(@RequestBody List<Long> ids) {
return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
@@ -112,7 +115,7 @@
/**
* 鍒犻櫎璺熻繘闄勪欢
*/
- @ApiOperation("鍒犻櫎璺熻繘闄勪欢")
+ @Operation(summary = "鍒犻櫎璺熻繘闄勪欢")
@DeleteMapping("/file/{fileId}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
public AjaxResult deleteFile(@PathVariable Integer fileId) {
@@ -123,7 +126,7 @@
/**
* 鍒犻櫎瀹㈡埛璺熻繘
*/
- @ApiOperation("鍒犻櫎瀹㈡埛璺熻繘")
+ @Operation(summary = "鍒犻櫎瀹㈡埛璺熻繘")
@DeleteMapping("/{id}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult remove(@PathVariable Integer id) {
@@ -133,7 +136,7 @@
/**
* 鏂板/鏇存柊鍥炶鎻愰啋
*/
- @ApiOperation("鏂板/鏇存柊鍥炶鎻愰啋")
+ @Operation(summary = "鏂板/鏇存柊鍥炶鎻愰啋")
@PostMapping("/return-visit")
@Log(title = "鍥炶鎻愰啋-鏂板/鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
@@ -143,7 +146,7 @@
/**
* 鑾峰彇鍥炶鎻愰啋璇︽儏
*/
- @ApiOperation("鑾峰彇鍥炶鎻愰啋璇︽儏")
+ @Operation(summary = "鑾峰彇鍥炶鎻愰啋璇︽儏")
@GetMapping("/return-visit/{customerId}")
public AjaxResult getReturnVisit(@PathVariable Integer customerId) {
return AjaxResult.success(customerReturnVisitService.getByCustomerId(customerId));
@@ -152,7 +155,7 @@
/**
* 鏍囪鍥炶鎻愰啋宸茶
*/
- @ApiOperation("鏍囪鍥炶鎻愰啋宸茶")
+ @Operation(summary = "鏍囪鍥炶鎻愰啋宸茶")
@PutMapping("/return-visit/read/{id}")
@Log(title = "鍥炶鎻愰啋-鏍囪宸茶", businessType = BusinessType.UPDATE)
public AjaxResult markAsRead(@PathVariable Long id) {
@@ -160,4 +163,15 @@
return AjaxResult.success();
}
+ /**
+ * 瀵煎嚭娲借皥杩涘害锛堟寜璺熻繘璁板綍灞曞紑锛�
+ */
+ @Operation(summary = "瀵煎嚭娲借皥杩涘害")
+ @PostMapping("/export")
+ @Log(title = "娲借皥杩涘害-瀵煎嚭", businessType = BusinessType.EXPORT)
+ public void export(HttpServletResponse response, String customerName, String customerType) {
+ ExcelUtil<CustomerFollowUpExportVo> util = new ExcelUtil<CustomerFollowUpExportVo>(CustomerFollowUpExportVo.class);
+ util.exportExcel(response, customerFollowUpService.selectFollowUpExportList(customerName, customerType), "娲借皥杩涘害");
+ }
+
}
--
Gitblit v1.9.3