From 652422ee99ff84d5198d770d8f70766dd591e686 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 05 七月 2024 20:19:31 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
index 231555a..9277c2b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
@@ -64,7 +64,7 @@
// 鍒嗙被
// 涓�绾у垎绫�
if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
- Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2));
+ Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2).eq(Tag::getHostId, hostId));
if (priTag == null) {
Tag top = tagService.getTop(hostId);
NodeUtils nodeUtils = new NodeUtils();
@@ -90,12 +90,13 @@
null, // 淇敼浜哄憳
null // 澶囨敞
);
+ priTag.setHostId(hostId);
if (tagMapper.insert(priTag) == 0) {
throw new CoolException("淇濆瓨涓�绾у垎绫诲け璐�");
}
}
// 浜岀骇鍒嗙被
- Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 3));
+ Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getSecClass()).eq(Tag::getLevel, 3).eq(Tag::getHostId, hostId));
if (secTag == null) {
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(priTag.getId());
@@ -120,6 +121,7 @@
null, // 淇敼浜哄憳
null // 澶囨敞
);
+ secTag.setHostId(hostId);
if (tagMapper.insert(secTag) == 0) {
throw new CoolException("淇濆瓨浜岀骇鍒嗙被澶辫触");
}
@@ -129,10 +131,11 @@
tagId = tagService.getTop(hostId).getId();
}
// 鍟嗗搧
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()));
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()).eq(Mat::getHostId, hostId));
if (mat == null) {
mat = excel;
mat.setTagId(tagId);
+ mat.setHostId(hostId);
if (!matService.save(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
--
Gitblit v1.9.1