From 6b908076f80a2c2933058caf5311ae2dc9048409 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 15:20:52 +0800
Subject: [PATCH] feat(approve): 更新审批流程配置节点查询逻辑
---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index e89e203..9aa6570 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -9,11 +10,12 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -32,8 +34,9 @@
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*/
@GetMapping("/list")
- public IPage<Customer> list(Page page, Customer customer) {
- return customerService.selectCustomerList(page, customer);
+ public R list(Page<CustomerDto> page, CustomerDto customer) {
+ IPage<CustomerDto> customerDtoIPage = customerService.selectCustomerList(page, customer);
+ return R.ok(customerDtoIPage);
}
/**
@@ -76,7 +79,7 @@
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(customerService.selectCustomerById(id));
+ return success(customerService.selectCustomerDetailById(id));
}
/**
@@ -116,4 +119,6 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
+
}
--
Gitblit v1.9.3