客户管理功能联调

src/main/java/com/rj/controller/CustomerManagementController.java

@@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rj.common.DataEnrichmentUtil;
 import com.rj.entity.CustomerManagement;
-import com.rj.entity.Dealership;
-import com.rj.entity.SalesManagement;
 import com.rj.service.ICustomerManagementService;
-import com.rj.service.IDealershipService;
-import com.rj.service.ISalesManagementService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,11 +13,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -140,7 +135,15 @@ public class CustomerManagementController {
             @Parameter(description = "联系方式（模糊查询）")
             @RequestParam(required = false) String contact,
             @Parameter(description = "所属门店ID")
-            @RequestParam(required = false) String dealershipId) {
+            @RequestParam(required = false) String dealershipId,
+            @Parameter(description = "创建开始时间", example = "2025-01-01 00:00:00")
+            @RequestParam(required = false) String createStartTime,
+            @Parameter(description = "创建结束时间", example = "2025-12-31 23:59:59")
+            @RequestParam(required = false) String createEndTime,
+            @Parameter(description = "修改开始时间", example = "2025-01-01 00:00:00")
+            @RequestParam(required = false) String updateStartTime,
+            @Parameter(description = "修改结束时间", example = "2025-12-31 23:59:59")
+            @RequestParam(required = false) String updateEndTime) {
         Map<String, Object> result = new HashMap<>();
         try {
             Page<CustomerManagement> page = new Page<>(current, size);
@@ -160,6 +163,49 @@ public class CustomerManagementController {
                 queryWrapper.eq(CustomerManagement::getDealershipId, dealershipId);
             }
             
+            // 添加时间范围查询条件
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            if (createStartTime != null && !createStartTime.trim().isEmpty()) {
+                try {
+                    LocalDateTime startTime = LocalDateTime.parse(createStartTime, formatter);
+                    queryWrapper.ge(CustomerManagement::getCreateTime, startTime);
+                } catch (Exception e) {
+                    result.put("success", false);
+                    result.put("message", "创建开始时间格式错误，请使用格式：yyyy-MM-dd HH:mm:ss");
+                    return ResponseEntity.badRequest().body(result);
+                }
+            }
+            if (createEndTime != null && !createEndTime.trim().isEmpty()) {
+                try {
+                    LocalDateTime endTime = LocalDateTime.parse(createEndTime, formatter);
+                    queryWrapper.le(CustomerManagement::getCreateTime, endTime);
+                } catch (Exception e) {
+                    result.put("success", false);
+                    result.put("message", "创建结束时间格式错误，请使用格式：yyyy-MM-dd HH:mm:ss");
+                    return ResponseEntity.badRequest().body(result);
+                }
+            }
+            if (updateStartTime != null && !updateStartTime.trim().isEmpty()) {
+                try {
+                    LocalDateTime startTime = LocalDateTime.parse(updateStartTime, formatter);
+                    queryWrapper.ge(CustomerManagement::getUpdateTime, startTime);
+                } catch (Exception e) {
+                    result.put("success", false);
+                    result.put("message", "修改开始时间格式错误，请使用格式：yyyy-MM-dd HH:mm:ss");
+                    return ResponseEntity.badRequest().body(result);
+                }
+            }
+            if (updateEndTime != null && !updateEndTime.trim().isEmpty()) {
+                try {
+                    LocalDateTime endTime = LocalDateTime.parse(updateEndTime, formatter);
+                    queryWrapper.le(CustomerManagement::getUpdateTime, endTime);
+                } catch (Exception e) {
+                    result.put("success", false);
+                    result.put("message", "修改结束时间格式错误，请使用格式：yyyy-MM-dd HH:mm:ss");
+                    return ResponseEntity.badRequest().body(result);
+                }
+            }
+            
             // 按创建时间倒序排列
             queryWrapper.orderByDesc(CustomerManagement::getUpdateTime);
             

src/main/java/com/rj/controller/sys/MenuController.java

@@ -403,6 +403,10 @@ public class MenuController {
 
 
 
+
+
+
+
 
 
 

src/main/java/com/rj/controller/sys/RoleController.java

@@ -373,6 +373,10 @@ public class RoleController {
 
 
 
+
+
+
+
 
 
 

src/main/java/com/rj/controller/sys/UserRoleController.java

@@ -379,6 +379,10 @@ public class UserRoleController {
 
 
 
+
+
+
+