Browse Source

Merge branch 'v2.0.0' of http://39.106.8.246:3003/persagy/dmp into v2.0.0

lixing 3 years ago
parent
commit
8123494295

+ 1 - 1
dmp-rwd/src/main/java/com/persagy/dmp/rwd/entity/ObjectInstance.java

@@ -41,7 +41,7 @@ public class ObjectInstance {
 	@Column(updatable = false)
 	private String classCode;
 
-	@Column(updatable = false)
+	@Column(updatable = false,name = "`grouping`")
 	private Integer grouping;
 
 	@Type(type = "json")

+ 5 - 4
dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/impl/BatchHandleObjectServiceImpl.java

@@ -299,7 +299,7 @@ public class BatchHandleObjectServiceImpl extends BaseService implements BatchHa
                     continue;
                 }
                 relDTOS.add(RelDTO.builder()
-                        .projectId(projectEntry.getKey())
+                        .projectId(projectEntry.getKey().toLowerCase())
                         .spaceIds(projectEntry.getValue()
                                 .stream()
                                 .map(ObjectInstance::getId)
@@ -311,7 +311,7 @@ public class BatchHandleObjectServiceImpl extends BaseService implements BatchHa
             return;
         }
         // 2.查询关系对象
-        List<RelationInstance> relationInstances = projectDao.queryObjRelBySpaceIdsAndProjectId(relDTOS,uploadDTO.getGroupCode());
+        List<RelationInstance> relationInstances = projectDao.queryObjRelBySpaceIdsAndProjectId(relDTOS,uploadDTO.getGroupCode().toLowerCase());
         if (CollUtil.isEmpty(relationInstances)){
             return;
         }
@@ -497,14 +497,15 @@ public class BatchHandleObjectServiceImpl extends BaseService implements BatchHa
                                              Set<String> transferProjectIds) {
         // 1.获取所有的rwd_object表和rwd_relation表(因为自测过程中发现有些rwd_object表有但rwd_relation表没有)
         // 1.1 获取所有的rwd_object表
+        String prjectPrefix="pj";
         Set<String> tableNames = objectInstanceRepository
-                .queryAllProjectTableNames(StrUtil.format(CommonConstant.RWD_OBJECT_TABLE_NAME_FORMAT,groupCode));
+                .queryAllProjectTableNames(StrUtil.format(CommonConstant.RWD_OBJECT_TABLE_NAME_FORMAT,groupCode.toLowerCase()));
         if (CollUtil.isEmpty(tableNames)){
             return new HashSet<>();
         }
         // 1.获取所有的rwd_object表
         Set<String> tableRelationNames = objectInstanceRepository
-                .queryAllProjectTableNames(StrUtil.format(CommonConstant.RWD_RELATION_TABLE_NAME_FORMAT,groupCode));
+                .queryAllProjectTableNames(StrUtil.format(CommonConstant.RWD_RELATION_TABLE_NAME_FORMAT,groupCode.toLowerCase()));
         if (CollUtil.isEmpty(tableRelationNames)){
             return new HashSet<>();
         }