Pārlūkot izejas kodu

准生产环境的交付数据,同步至客户生产环境 excel表格数据调整

lvxianyun 3 gadi atpakaļ
vecāks
revīzija
b53af08eb8

+ 3 - 2
src/main/java/com/persagy/proxy/migration/handler/ObjectRelationMigration.java

@@ -298,8 +298,8 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
             DataMigrationExcel excel = new DataMigrationExcel();
             excel.setId(objectRelation.getId());
             excel.setName(String.join(StrUtil.DASHED, objectRelation.getRelCode(), objectRelation.getGraphCode()));
-            excel.setCode(objectRelation.getObjFrom());
-            excel.setCode1(objectRelation.getObjTo());
+            excel.setObjFrom(objectRelation.getObjFrom());
+            excel.setTargetProject(objectRelation.getObjTo());
             excel.setType(type);
             dataMigrationExcels.add(excel);
         }
@@ -326,6 +326,7 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
                 syncData.setTableName(MigrationTable.DTRELATION.getCode());
                 syncData.setType(type);//操作
                 syncData.setTargetId(relation.getId());
+                syncData.setName(String.join(StrUtil.DASHED, relation.getRelCode(), relation.getGraphCode()));
                 syncData.setFromId(relation.getObjFrom());
                 syncData.setToId(relation.getObjTo());
                 syncDataList.add(syncData);

+ 11 - 7
src/main/java/com/persagy/proxy/migration/model/DataMigrationExcel.java

@@ -32,26 +32,30 @@ public class DataMigrationExcel {
     private String code;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "code1", index=3)
-    private String code1;
+    @ExcelProperty(value = "objFrom", index=3)
+    private String objFrom;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "类型(增加/删除/修改)", index=4)
+    @ExcelProperty(value = "objTo", index=4)
+    private String objTo;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "类型(增加/删除/修改)", index=5)
     private String type;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "源(云端/现场)", index=5)
+    @ExcelProperty(value = "源(云端/现场)", index=6)
     private String directional = "adm-to-project";
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "from(adm)", index=6)
+    @ExcelProperty(value = "from(adm)", index=7)
     private String source;
 
     @ColumnWidth(30)
-    @ExcelProperty(value = "to(project)", index=7)
+    @ExcelProperty(value = "to(project)", index=8)
     private String targetProject;
 
     @ColumnWidth(50)
-    @ExcelProperty(value = "备注", index=8)
+    @ExcelProperty(value = "备注", index=9)
     private String mark;
 }