From 33eccd5e76d865b3f3c4a421cd993498c25b6137 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 10 四月 2026 10:46:32 +0800
Subject: [PATCH] fix: 客户区分宜搭/手动新增
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 4 ++++
doc/宁夏-中盛建材.sql | 5 ++++-
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 9 +++++++--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 944b4ba..afbf1e9 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -539,4 +539,7 @@
MODIFY COLUMN `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鏂囦欢璁块棶鍦板潃' AFTER `file_url`;
ALTER TABLE `product-inventory-management-zsjc`.`product_material_sku`
- ADD COLUMN `type` int NULL COMMENT '鏁版嵁鏉ユ簮(1-瀹滄惌/2-閽夐拤)' AFTER `update_time`;
\ No newline at end of file
+ ADD COLUMN `type` int NULL COMMENT '鏁版嵁鏉ユ簮(1-瀹滄惌/2-閽夐拤)' AFTER `update_time`;
+
+ALTER TABLE `product-inventory-management-zsjc`.`customer`
+ ADD COLUMN `type` int NULL COMMENT '鏁版嵁鏉ユ簮(1-瀹滄惌/2-鎵嬪姩鏂板)' AFTER `form_modified_time`;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index e4fdad3..8b3cca6 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -122,4 +122,8 @@
@ApiModelProperty("瀹滄惌淇敼鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime formModifiedTime;
+
+ @ApiModelProperty("鏁版嵁鏉ユ簮(1-瀹滄惌/2-鎵嬪姩鏂板)'")
+ private Integer type;
+
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 494f462..e8e8b59 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -205,6 +205,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
Long tenantId = loginUser.getTenantId();
customer.setTenantId(tenantId);
+ customer.setType(2);
return customerMapper.insert(customer);
}
@@ -347,9 +348,12 @@
String searchFieldJson = searchConditions.toJSONString();
- JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getCustomerCodeFormUuid(), searchFieldJson, this, Customer::getFormModifiedTime);
+ LambdaQueryWrapper<Customer> countWrapper = new LambdaQueryWrapper<>();
+ countWrapper.eq(Customer::getType, 1);
- if (dataArr.isEmpty()) {
+ JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getCustomerCodeFormUuid(), searchFieldJson, this, Customer::getFormModifiedTime, countWrapper);
+
+ if (dataArr == null || dataArr.isEmpty()) {
log.info("娌℃湁鏇村鏂版暟鎹渶瑕佸悓姝�");
return;
}
@@ -387,6 +391,7 @@
customer.setMaintenanceTime(date);
customer.setFormInstanceId(formInstanceId);
customer.setFormModifiedTime(dateTime);
+ customer.setType(1);
list.add(customer);
}
return list;
--
Gitblit v1.9.3