lyhzzz 1 年之前
父節點
當前提交
4d006ae08e

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/ITmProjectService.java

@@ -51,4 +51,6 @@ public interface ITmProjectService extends IService<TmProject> {
     List<DataGroupVo> groupByReason(DataParam param, List<String> deptIds);
 
     String setCaseNewName(TmProject tmProject);
+
+    List<TmProject> getLikeByProjectSn(String projectSn);
 }

+ 8 - 1
src/main/java/com/fdkankan/fusion/service/impl/CopyCaseService.java

@@ -110,8 +110,15 @@ public class CopyCaseService {
     private String cpProject(String oldProjectId) {
         TmProject tmProject = projectService.getById(oldProjectId);
         String newId = IdUtils.genId(IdPreEnum.PROJECT_PRE.getPre());
+
         tmProject.setId(newId);
-        tmProject.setProjectSn(tmProject.getProjectSn() +"(copy)");
+        String projectSn = tmProject.getProjectSn() +"(copy)";
+        TmProject byProjectSn = projectService.getByProjectSn(projectSn);
+        if(byProjectSn != null){
+            List<TmProject> projectSnList = projectService.getLikeByProjectSn(projectSn);
+            projectSn += projectSnList.size() +1;
+        }
+        tmProject.setProjectSn(projectSn);
         tmProject.setCaseNewName(projectService.setCaseNewName(tmProject));
         projectService.save(tmProject);
         cpMessage(oldProjectId,newId);

+ 14 - 1
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -354,7 +354,20 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         LambdaQueryWrapper<TmProject> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TmProject::getProjectSn,projectSn);
         wrapper.eq(TmProject::getIsDelete,0);
-        return this.getOne(wrapper);
+        List<TmProject> list = this.list(wrapper);
+        if(list == null || list.isEmpty()){
+            return null;
+        }
+        return list.get(0);
+    }
+
+    @Override
+    public List<TmProject> getLikeByProjectSn(String projectSn) {
+        LambdaQueryWrapper<TmProject> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(TmProject::getProjectSn,projectSn);
+        wrapper.eq(TmProject::getIsDelete,0);
+        List<TmProject> list = this.list(wrapper);
+        return list;
     }
 
     @Override