fix(大编辑)：bug修复

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -112,7 +112,7 @@ public class PieLineDataChangeServiceImpl {
     public void deletePieLineBatch(List<PipelineChangeItemDto> deletedPieLines, List<FieldChangeMeta> allChangeColumns, String projectContraptionId) {
         List<String> recordsForDeleted = deletedPieLines.stream().map(TechParamsPipelineChangeFieldDto::getRecord).collect(Collectors.toList());
         // 构建删除日志
-        this.buildDeletePieLineLog(recordsForDeleted, allChangeColumns, projectContraptionId);
+        this.buildDeletePieLineLog(deletedPieLines, allChangeColumns, projectContraptionId);
         // 删除涉及的19张表的数据
         superviseInfoMapper.deleteDataAll(recordsForDeleted);
         List<ESEquipmentCategoryDto> esDtoList = recordsForDeleted.stream().map(v -> {
@@ -124,21 +124,21 @@ public class PieLineDataChangeServiceImpl {
         esEquipmentCategory.deleteAll(esDtoList);
     }
 
-    private void buildDeletePieLineLog(List<String> recordsForDeleted, List<FieldChangeMeta> allChangeColumns, String projectContraptionId) {
-        recordsForDeleted.forEach(record -> {
+    private void buildDeletePieLineLog(List<PipelineChangeItemDto> recordsForDeleted, List<FieldChangeMeta> allChangeColumns, String projectContraptionId) {
+        recordsForDeleted.forEach(item -> {
             FieldChangeMeta fieldChangeMeta = new FieldChangeMeta();
             fieldChangeMeta.setChangeId(projectContraptionId);
             fieldChangeMeta.setColumnKey(PIE_LINE_KEY);
-            fieldChangeMeta.setChangeId(projectContraptionId + "/" + record);
+            fieldChangeMeta.setChangeId(projectContraptionId + "/" + item.getRecord());
             fieldChangeMeta.setColumnLabel("管道删除");
             fieldChangeMeta.setColumnType("String");
             fieldChangeMeta.setFieldDisplayDefine(null);
             fieldChangeMeta.setColumnFamily(PIE_LINE_DELETE);
-            fieldChangeMeta.setColumnNewValue(null);
             fieldChangeMeta.setIsRepeatColumn(false);
+            fieldChangeMeta.setColumnOldValue(item.getRecord());
+            fieldChangeMeta.setDisplayOldValue(item.getPipelineNumber());
+            fieldChangeMeta.setColumnNewValue(null);
             fieldChangeMeta.setDisplayNewValue(null);
-            fieldChangeMeta.setColumnOldValue(record);
-            fieldChangeMeta.setDisplayOldValue(record);
             allChangeColumns.add(fieldChangeMeta);
         });
     }
@@ -147,7 +147,7 @@ public class PieLineDataChangeServiceImpl {
         String record = idUtil.nextId().toString();
         newPieLine.setRecord(record);
         newPieLine.setProjectContraptionId(projectContraptionChangeDataDto.getProjectContraptionId());
-        this.buildNewPieLineLog(projectContraptionChangeDataDto, record, allChangeColumns);
+        this.buildNewPieLineLog(projectContraptionChangeDataDto, record, allChangeColumns, newPieLine);
         // 检验信息
         IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = BeanUtil.copyProperties(newPieLine, IdxBizJgInspectionDetectionInfo.class);
         if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
@@ -265,7 +265,7 @@ public class PieLineDataChangeServiceImpl {
         esEquipmentCategory.save(esEquipmentDto);
     }
 
-    private void buildNewPieLineLog(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, String record, List<FieldChangeMeta> allChangeColumns) {
+    private void buildNewPieLineLog(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, String record, List<FieldChangeMeta> allChangeColumns, PipelineChangeItemDto newPieLine) {
         FieldChangeMeta fieldChangeMeta = new FieldChangeMeta();
         fieldChangeMeta.setChangeId(projectContraptionChangeDataDto.getProjectContraptionId());
         fieldChangeMeta.setColumnKey(PIE_LINE_KEY);
@@ -274,12 +274,12 @@ public class PieLineDataChangeServiceImpl {
         fieldChangeMeta.setChangeId(projectContraptionChangeDataDto.getProjectContraptionId() + "/" + record);
         fieldChangeMeta.setFieldDisplayDefine(null);
         fieldChangeMeta.setColumnFamily(PIE_LINE_CREATE);
-        fieldChangeMeta.setColumnNewValue(record);
-        fieldChangeMeta.setDisplayNewValue(record);
         fieldChangeMeta.setIsRepeatColumn(false);
         fieldChangeMeta.setDisplayNewValue(record);
         fieldChangeMeta.setColumnOldValue(null);
         fieldChangeMeta.setDisplayOldValue(null);
+        fieldChangeMeta.setColumnNewValue(record);
+        fieldChangeMeta.setDisplayNewValue(newPieLine.getPipelineNumber());
         allChangeColumns.add(fieldChangeMeta);
     }