page = new Page<>(current, size);
@@ -346,6 +339,9 @@ public class AudioManagementController {
if (salesPhone != null && !salesPhone.trim().isEmpty()) {
queryWrapper.like(AudioManagement::getSalesPhone, salesPhone);
}
+ if (syncStatus != null && !syncStatus.trim().isEmpty()) {
+ queryWrapper.eq(AudioManagement::getSyncStatus, syncStatus);
+ }
// 按创建时间倒序排列
queryWrapper.orderByDesc(AudioManagement::getUpdateTime);
@@ -367,7 +363,9 @@ public class AudioManagementController {
audioPage.getRecords().forEach(audio -> {
audio.setDealershipName(dealershipNameMap.getOrDefault(audio.getDealershipId(), ""));
- audio.setSalesName(saleNameMap.getOrDefault(audio.getSalesId(), ""));
+ if (StringUtils.isEmpty( audio.getSalesName())) {
+ audio.setSalesName(saleNameMap.getOrDefault(audio.getSalesId(), ""));
+ }
audio.setSalesPhone(salePhoneMap.getOrDefault(audio.getSalesId(), ""));
audio.setProjectName(projectNameMap.getOrDefault(audio.getProjectId(), ""));
// audio.setCustomerName(customerNameMap.getOrDefault(audio.getCustomerId(), ""));
diff --git a/src/main/java/com/rj/controller/CustomerManagementController.java b/src/main/java/com/rj/controller/CustomerManagementController.java
index 880e037..b8d9268 100644
--- a/src/main/java/com/rj/controller/CustomerManagementController.java
+++ b/src/main/java/com/rj/controller/CustomerManagementController.java
@@ -2,14 +2,18 @@ package com.rj.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.rj.common.AudioManagementConstants;
import com.rj.common.DataEnrichmentUtil;
+import com.rj.entity.AudioManagement;
import com.rj.entity.CustomerManagement;
+import com.rj.service.IAudioManagementService;
import com.rj.service.ICustomerManagementService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -17,6 +21,7 @@ import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
/**
*
@@ -34,27 +39,58 @@ public class CustomerManagementController {
@Autowired
private ICustomerManagementService customerManagementService;
+ @Autowired
+ private IAudioManagementService audioManagementService;
+
/**
* 新增客户
*/
@PostMapping("/add")
@Operation(summary = "新增客户", description = "添加新的客户信息")
+ @Transactional(rollbackFor = Exception.class)
public ResponseEntity