From ad7cf55804ef7e37bedf3924865df41ec3530fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Thu, 19 Jun 2025 15:44:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=B4=E4=BF=AE=E9=A1=B9=E7=9B=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/ErpMaintainProjectVo.java | 2 +- .../ErpExamineProjectImportListener.java | 12 +++++----- .../ErpMaintainCauseImportListener.java | 4 ++-- .../ErpMaintainProjectImportListener.java | 23 ++++++++++++++++++- .../ErpMalfunctionProjectImportListener.java | 10 ++++---- 5 files changed, 37 insertions(+), 14 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainProjectVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainProjectVo.java index 3570c75..5b2bf6f 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainProjectVo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainProjectVo.java @@ -67,7 +67,7 @@ public class ErpMaintainProjectVo implements Serializable { /** * 保质期（天） */ - @ExcelProperty(value = "保质期") + @ExcelProperty(value = "保质期(天)") private Integer warrantyPeriod; /** diff --git a/maintain-business/src/main/java/com/maintain/business/listener/ErpExamineProjectImportListener.java b/maintain-business/src/main/java/com/maintain/business/listener/ErpExamineProjectImportListener.java index f56ce1f..d1da2d9 100644 --- a/maintain-business/src/main/java/com/maintain/business/listener/ErpExamineProjectImportListener.java +++ b/maintain-business/src/main/java/com/maintain/business/listener/ErpExamineProjectImportListener.java @@ -19,6 +19,7 @@ import com.maintain.common.excel.ExcelListener; import com.maintain.common.excel.ExcelResult; import com.maintain.common.exception.ServiceException; import com.maintain.common.helper.LoginHelper; +import com.maintain.common.utils.StringUtils; import com.maintain.common.utils.ValidatorUtils; import com.maintain.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; @@ -26,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; /** - * 故障项目自定义导入 + * 检验项目自定义导入 * * @author liushuai */ @@ -63,15 +64,14 @@ public class ErpExamineProjectImportListener extends AnalysisEventListener typeLambdaQueryWrapper = Wrappers.lambdaQuery(); - typeLambdaQueryWrapper.eq(ErpProjectType::getTypeName, erpExamineProject.getTypeName()) - .eq(ErpProjectType::getType, ProjectType.EXAMINE.getCode()); - ErpProjectType projectType = typeMapper.selectOne(typeLambdaQueryWrapper); + ErpProjectType projectType = typeMapper.selectOne( + new LambdaQueryWrapper().eq(ErpProjectType::getTypeName, erpExamineProject.getTypeName()) + .eq(ErpProjectType::getType, ProjectType.EXAMINE.getCode())); if (null == projectType) { ErpProjectType type = new ErpProjectType(); type.setTypeName(erpExamineProject.getTypeName()); type.setParentId(Long.valueOf(ProjectType.EXAMINE.getCode())); - type.setAncestors("0,3"); + type.setAncestors("0" + StringUtils.SEPARATOR + ProjectType.EXAMINE.getCode()); type.setType(ProjectType.EXAMINE.getCode()); typeMapper.insert(type); erpExamineProject.setTypeId(type.getTypeId()); diff --git a/maintain-business/src/main/java/com/maintain/business/listener/ErpMaintainCauseImportListener.java b/maintain-business/src/main/java/com/maintain/business/listener/ErpMaintainCauseImportListener.java index 46247a1..56fea93 100644 --- a/maintain-business/src/main/java/com/maintain/business/listener/ErpMaintainCauseImportListener.java +++ b/maintain-business/src/main/java/com/maintain/business/listener/ErpMaintainCauseImportListener.java @@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; /** - * 故障项目自定义导入 + * 维修原因自定义导入 * * @author liushuai */ @@ -52,7 +52,7 @@ public class ErpMaintainCauseImportListener extends AnalysisEventListener().eq(ErpProjectType::getTypeName, maintainProject.getTypeName()).eq(ErpProjectType::getType, ProjectType.MAINTAIN.getCode())); + if (null == projectType) { + ErpProjectType erpProjectType = new ErpProjectType(); + erpProjectType.setTypeName(maintainProject.getTypeName()); + erpProjectType.setParentId(Long.valueOf(ProjectType.MAINTAIN.getCode())); + erpProjectType.setAncestors("0" + StringUtils.SEPARATOR + ProjectType.MAINTAIN.getCode()); + erpProjectType.setType(ProjectType.MAINTAIN.getCode()); + projectTypeMapper.insert(erpProjectType); + maintainProject.setTypeId(erpProjectType.getTypeId()); + }else { + maintainProject.setTypeId(projectType.getTypeId()); + } + } projectMapper.insert(maintainProject); successNum++; successMsg.append("
").append(successNum).append("、维修项目 ").append(maintainProject.getProjectName()).append(" 导入成功"); diff --git a/maintain-business/src/main/java/com/maintain/business/listener/ErpMalfunctionProjectImportListener.java b/maintain-business/src/main/java/com/maintain/business/listener/ErpMalfunctionProjectImportListener.java index 4ee9039..ba8eae7 100644 --- a/maintain-business/src/main/java/com/maintain/business/listener/ErpMalfunctionProjectImportListener.java +++ b/maintain-business/src/main/java/com/maintain/business/listener/ErpMalfunctionProjectImportListener.java @@ -20,6 +20,7 @@ import com.maintain.common.excel.ExcelListener; import com.maintain.common.excel.ExcelResult; import com.maintain.common.exception.ServiceException; import com.maintain.common.helper.LoginHelper; +import com.maintain.common.utils.StringUtils; import com.maintain.common.utils.ValidatorUtils; import com.maintain.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; @@ -64,14 +65,15 @@ public class ErpMalfunctionProjectImportListener extends AnalysisEventListener projectTypeLambdaQueryWrapper = Wrappers.lambdaQuery(); - projectTypeLambdaQueryWrapper.eq(ErpProjectType::getTypeName, malfunctionProject.getTypeName()).eq(ErpProjectType::getType, ProjectType.MALFUNCTION.getCode()); - ErpProjectType erpProjectType = projectTypeMapper.selectOne(projectTypeLambdaQueryWrapper); + ErpProjectType erpProjectType = projectTypeMapper.selectOne( + new LambdaQueryWrapper() + .eq(ErpProjectType::getTypeName, malfunctionProject.getTypeName()) + .eq(ErpProjectType::getType, ProjectType.MALFUNCTION.getCode())); if (erpProjectType == null) { ErpProjectType projectType = new ErpProjectType(); projectType.setTypeName(malfunctionProject.getTypeName()); projectType.setParentId(2L); - projectType.setAncestors("0,2"); + projectType.setAncestors("0" + StringUtils.SEPARATOR + ProjectType.MALFUNCTION.getCode()); projectType.setType(ProjectType.MALFUNCTION.getCode()); projectTypeMapper.insert(projectType); malfunctionProject.setTypeId(projectType.getTypeId()); -- 2.22.0