1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4164,13 +4164,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         String subProject = stringCellValue.contains("/")?stringCellValue.split("/")[1].trim():"";
 
                         subProjectList.add(subProject);
-                        if (!allProjectList.stream().filter(p->p.getProjectName().equals(projectName)).findAny().isPresent()) {
+                        if (!allProjectList.stream().filter(p->p.getProjectName().equals(projectName)||(p.getProjectCode()!=null&&p.getProjectCode().equals(projectName))).findAny().isPresent()) {
                             projectNotExists = true;
                             neProjectName = projectName;
                             break;
                         }
                         //检查子项目是否存在
-                        if (!StringUtils.isEmpty(subProject) && !allSubProjectList.stream().anyMatch(subp->subp.getName().equals(subProject))) {
+                        if (!StringUtils.isEmpty(subProject) && !allSubProjectList.stream().anyMatch(subp->subp.getName().equals(subProject)||(subp.getCode()!=null&&subp.getCode().equals(subProject)))) {
                             subPNotExists = true;
                             neSubPName = subProject;
                             break;
@@ -4235,7 +4235,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             time = Double.parseDouble(stringCellValue);
                             if (time > 0) {
                                 String pName = projectList.get(i-projectNameStartIndex);
-                                Project project = allProjectList.stream().filter(p -> p.getProjectName().equals(pName)).findFirst().get();
+                                Project project = allProjectList.stream().filter(p -> p.getProjectName().equals(pName)||(p.getProjectCode()!=null&&p.getProjectCode().equals(pName))).findFirst().get();
                                 String subPName = subProjectList.get(i-projectNameStartIndex);
                                 Report report = new Report();
                                 report.setCompanyId(companyId);
@@ -4245,7 +4245,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 //子项目
                                 if (!StringUtils.isEmpty(subPName)) {
                                     Optional<SubProject> first = allSubProjectList.stream()
-                                            .filter(sub -> sub.getProjectId().equals(project.getId()) && sub.getName().equals(subPName)).findFirst();
+                                            .filter(sub -> sub.getProjectId().equals(project.getId()) &&( sub.getName().equals(subPName)||(sub.getCode()!=null&&sub.getCode().equals(subPName)))).findFirst();
                                     if (first.isPresent()) {
                                         report.setSubProjectId(first.get().getId());
                                     }