From d6c8f5b4f76a50f36b51b985dc061631795d6303 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 10 四月 2026 13:03:25 +0800
Subject: [PATCH] fix: 生产订单返回原始工艺路线ID,更改绑定工艺路线清除旧数据
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
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 080314c..e8e8b59 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -173,17 +173,17 @@
c.setAddressPhone(address + "(" + phone + ")");
// 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
- CustomerFollowUp followUp = customerFollowUpService.getOne(
- new LambdaQueryWrapper<CustomerFollowUp>()
- .eq(CustomerFollowUp::getCustomerId, c.getId())
- .orderByDesc(CustomerFollowUp::getFollowUpTime)
- .last("LIMIT 1")
- );
-
- if (followUp != null) {
- c.setFollowUpLevel(followUp.getFollowUpLevel());
- c.setFollowUpTime(followUp.getFollowUpTime());
- }
+// CustomerFollowUp followUp = customerFollowUpService.getOne(
+// new LambdaQueryWrapper<CustomerFollowUp>()
+// .eq(CustomerFollowUp::getCustomerId, c.getId())
+// .orderByDesc(CustomerFollowUp::getFollowUpTime)
+// .last("LIMIT 1")
+// );
+//
+// if (followUp != null) {
+// c.setFollowUpLevel(followUp.getFollowUpLevel());
+// c.setFollowUpTime(followUp.getFollowUpTime());
+// }
})
.collect(Collectors.toList());
@@ -205,6 +205,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
Long tenantId = loginUser.getTenantId();
customer.setTenantId(tenantId);
+ customer.setType(2);
return customerMapper.insert(customer);
}
@@ -276,7 +277,7 @@
@Override
public void syncCustomerJob() {
- syncCustomerData(2);
+ syncCustomerData();
}
@Override
@@ -322,11 +323,7 @@
* 鍚屾鏁版嵁
*/
@Transactional(rollbackFor = Exception.class)
- public void syncCustomerData(Integer dataSyncType) {
- if (!syncLock.tryLock()) {
- log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩" : "瀹氭椂浠诲姟");
- return;
- }
+ public void syncCustomerData() {
try {
JSONArray searchConditions = new JSONArray();
JSONObject statusCondition = new JSONObject();
@@ -351,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;
}
@@ -368,9 +368,6 @@
} catch (Exception e) {
log.error("鍚屾瀹㈡埛淇℃伅寮傚父", e);
- } finally {
- // 閲婃斁閿�
- syncLock.unlock();
}
}
@@ -394,6 +391,7 @@
customer.setMaintenanceTime(date);
customer.setFormInstanceId(formInstanceId);
customer.setFormModifiedTime(dateTime);
+ customer.setType(1);
list.add(customer);
}
return list;
--
Gitblit v1.9.3