Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -613,7 +613,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 // 新报检单记录历史数据的逻辑
                 map.putAll(inspectionHistory.getHistoryData());
             } else {
-                // 历史单位之前未记录历史数据的逻辑
+                // 兼容逻辑：历史单据之前未记录历史数据的逻辑
                 if (model.getEquipClassify().equals(EquipmentClassifityEnum.YLGD.getCode())) {
                     // 压力管道
                     map.putAll(getDeviceListByProjectContraption2(model));
@@ -1480,11 +1480,19 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         List<String> records = applicationEquipModels.stream().map(JyjcInspectionApplicationEquipModel::getEquipUnicode).collect(Collectors.toList());
         JSONObject jsonObject = new JSONObject();
         List<Map<String, Object>> equList = this.getBaseMapper().selectPieLineListOfInspect(records);
+        return setPieLineInfo(applicationModel, projectContraption, jsonObject, equList);
+    }
+
+    @NotNull
+    private JSONObject setPieLineInfo(JyjcInspectionApplicationModel applicationModel, IdxBizJgProjectContraption projectContraption, JSONObject jsonObject, List<Map<String, Object>> equList) {
         jsonObject.put("equip", equList);
         jsonObject.put("projectContraption", projectContraption.getProjectContraption());
         jsonObject.put("projectContraptionId", applicationModel.getProjectContraptionId());
         jsonObject.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
         jsonObject.put("pipelineLength", calTotalLength(equList));
+        jsonObject.put("equListName",  projectContraption.getEquListName());
+        jsonObject.put("equCategoryName", projectContraption.getEquCategoryName());
+        jsonObject.put("equDefineName" , projectContraption.getEquDefineName());
         jsonObject.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
         this.setInstallAddress(projectContraption, jsonObject);
         this.setUseAddress(projectContraption, jsonObject);
@@ -1515,15 +1523,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(applicationModel.getSequenceNbr());
         List<String> records = applicationEquipModels.stream().map(JyjcInspectionApplicationEquipModel::getEquipUnicode).collect(Collectors.toList());
         List<Map<String, Object>> equList = this.getBaseMapper().selectPieLineListOfNoInspectInfo(records);
-        jsonObject.put("equip", equList);
-        jsonObject.put("projectContraption", projectContraption.getProjectContraption());
-        jsonObject.put("projectContraptionId", applicationModel.getProjectContraptionId());
-        jsonObject.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
-        jsonObject.put("pipelineLength", calTotalLength(equList));
-        jsonObject.put("useRegistrationCode", projectContraption.getUseRegistrationCode());
-        this.setInstallAddress(projectContraption, jsonObject);
-        this.setUseAddress(projectContraption, jsonObject);
-        return jsonObject;
+        return setPieLineInfo(applicationModel, projectContraption, jsonObject, equList);
     }
 
     private String calTotalLength(List<Map<String, Object>> equList) {