| | |
| | | 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); |
| | |
| | | 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("更新分公司编码: {}, 服务单编码: {}, 调度单编码: {}", |
| | |
| | | // newBranch.setDepartmentId(dto.getDepartmentId()); |
| | | |
| | | // 自动匹配并设置服务单和调度单编码 |
| | | syncOrderClassCodes(newBranch, parts[0].trim(), serviceOrderList, dispatchOrderList,addressList); |
| | | syncOrderClassCodes(newBranch, cityName, serviceOrderList, dispatchOrderList,addressList); |
| | | |
| | | sysDeptMapper.insertDept(newBranch); |
| | | branchDeptId = newBranch.getDeptId(); |
| | |
| | | // 遍历编码列表,查找包含城市名称的项 |
| | | for (OrderClassDTO dto : orderClassList) |
| | | { |
| | | //有些加了新 TODO |
| | | if (dto.getVtext() != null && dto.getVtext().contains(cityName)) |
| | | { |
| | | log.debug("城市名称匹配成功 - 城市: {}, vtext: {}, vOrder2: {}", |