From 656d6f8029f8bf9b2daa9dcc89101a879a70b860 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 03 十二月 2025 23:10:05 +0800
Subject: [PATCH] feat:优先添加执行人
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DepartmentSyncServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DepartmentSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DepartmentSyncServiceImpl.java
index 2fbce75..5e1cf76 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DepartmentSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DepartmentSyncServiceImpl.java
@@ -88,11 +88,32 @@
if (parts.length != 2)
{
log.warn("閮ㄩ棬鍚嶇О鏍煎紡涓嶆纭紝璺宠繃: {}", fullName);
- continue;
+ parts= fullName.split("-");
+ if(parts.length != 2) {
+ continue;
+ }
+ }
+ String part="";
+ //鍙鍙戠幇鏈�(鏂�)鎴栵紙鏂帮級灏卞湪branchName涓姞涓柊 瀛�
+ if(fullName.contains("(鏂�)") || fullName.contains("锛堟柊锛�")) {
+ part="锛堟柊锛�";
}
String branchName = parts[0].trim() + "鍒嗗叕鍙�"; // 婀涙睙 -> 婀涙睙鍒嗗叕鍙�
String deptName = parts[1].trim(); // 鎶ゅ＋
+ String cityName=parts[0].trim();
+ String namePart=parts[0].trim();
+ if(namePart.contains("(鏂�)") || namePart.contains("锛堟柊锛�")) {
+ branchName=namePart+"鍒嗗叕鍙�";
+ cityName=namePart;
+ deptName=parts[1].trim();
+ }
+ else{
+ branchName=namePart+part+"鍒嗗叕鍙�";
+ cityName=namePart+ part;
+ deptName=parts[1].trim();
+ }
+
// 鑾峰彇鎴栧垱寤哄垎鍏徃
Long branchDeptId = branchMap.get(branchName);
@@ -107,7 +128,7 @@
branchMap.put(branchName, branchDeptId);
// 妫�鏌ュ苟鏇存柊缂栫爜
- syncOrderClassCodes(existingBranch, parts[0].trim(), serviceOrderList, dispatchOrderList,addressList);
+ syncOrderClassCodes(existingBranch, cityName, serviceOrderList, dispatchOrderList,addressList);
// existingBranch.setDepartmentId(dto.getDepartmentId());
sysDeptMapper.updateDept(existingBranch);
log.info("鏇存柊鍒嗗叕鍙哥紪鐮�: {}, 鏈嶅姟鍗曠紪鐮�: {}, 璋冨害鍗曠紪鐮�: {}",
@@ -126,7 +147,7 @@
// newBranch.setDepartmentId(dto.getDepartmentId());
// 鑷姩鍖归厤骞惰缃湇鍔″崟鍜岃皟搴﹀崟缂栫爜
- syncOrderClassCodes(newBranch, parts[0].trim(), serviceOrderList, dispatchOrderList,addressList);
+ syncOrderClassCodes(newBranch, cityName, serviceOrderList, dispatchOrderList,addressList);
sysDeptMapper.insertDept(newBranch);
branchDeptId = newBranch.getDeptId();
@@ -479,6 +500,7 @@
// 閬嶅巻缂栫爜鍒楄〃锛屾煡鎵惧寘鍚煄甯傚悕绉扮殑椤�
for (OrderClassDTO dto : orderClassList)
{
+ //鏈変簺鍔犱簡鏂� TODO
if (dto.getVtext() != null && dto.getVtext().contains(cityName))
{
log.debug("鍩庡競鍚嶇О鍖归厤鎴愬姛 - 鍩庡競: {}, vtext: {}, vOrder2: {}",
--
Gitblit v1.9.1