From e756af0f5bfd1addbd5d5c145441fb34aad91a28 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 13:55:58 +0800
Subject: [PATCH] 同步工控网
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
index b8649bd..3ddf601 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
@@ -2,11 +2,13 @@
import cn.hutool.core.util.StrUtil;
import com.jeecg.weibo.exception.BusinessException;
+import liquibase.pro.packaged.S;
import org.jeecg.modules.dnc.dto.ComponentHierarchy;
import org.jeecg.modules.dnc.dto.TransferPackage;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.mapper.*;
import org.jeecg.modules.dnc.service.*;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysUserService;
import org.slf4j.Logger;
@@ -286,20 +288,22 @@
private void savePermissionStreamNewList(List<PermissionStreamNew> permissionStreamNewList) {
for (PermissionStreamNew permissionStreamNew : permissionStreamNewList) {
- if (permissionStreamNew.getUserId() != null) {
- String id=sysUserService.getUserByName(permissionStreamNew.getUserId()).getId();
- if (id!=null){
- permissionStreamNew.setUserId(id);
+ if (permissionStreamNewMapper.selectById(permissionStreamNew.getId()) == null) {
+ if (permissionStreamNew.getUserId() != null) {
+ String id=sysUserService.getUserByName(permissionStreamNew.getUserId()).getId();
+ if (id!=null){
+ permissionStreamNew.setUserId(id);
+ }
}
- }
- if (permissionStreamNew.getDepartId() != null) {
- String id=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId()).getId();
- if (id!=null){
- permissionStreamNew.setDepartId(id);
+ if (permissionStreamNew.getDepartId() != null) {
+ MdcProduction mdcProduction=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId());
+ if (mdcProduction!=null){
+ permissionStreamNew.setDepartId(mdcProduction.getId());
+ }
}
+ permissionStreamNewMapper.insert(permissionStreamNew);
+ logger.debug("鏉冮檺宸蹭繚瀛�: {}", permissionStreamNew.getId());
}
- permissionStreamNewMapper.insert(permissionStreamNew);
- logger.debug("鏉冮檺宸蹭繚瀛�: {}", permissionStreamNew.getId());
}
//鍒嗘壒娣诲姞浜у搧銆侀儴浠躲�侀浂浠躲�佸伐鑹鸿绋嬨�佸伐搴忋�佸伐姝ユ潈闄�
permissionStreamNewList.forEach(item -> {
@@ -383,7 +387,7 @@
workStepDepartmentService.save(workStepDepartment);
}
break;
- default:
+ default:
}
});
}
@@ -446,6 +450,7 @@
private void saveGuideCardBatch(GuideCardBatch guideCardBatch) {
if (guideCardBatchMapper.selectById(guideCardBatch.getId()) == null) {
+ guideCardBatch.setFlowStatus("1");
guideCardBatchMapper.insert(guideCardBatch);
logger.debug("鍒�鐗囨壒娆″凡淇濆瓨: {}", guideCardBatch.getId());
} else {
--
Gitblit v1.9.3