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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01001_202400OFData.java

@@ -106,8 +106,8 @@ public class QC01001_202400OFData implements IDynamicOFData {
         Set<String> equipNameSet = new LinkedHashSet<>();
         Set<String> productCodeSet = new LinkedHashSet<>();
         Set<String> projectNameSet = new LinkedHashSet<>();
-        Set<String> unitAddressSet = new LinkedHashSet<>();
-        Set<String> zipCodeSet = new LinkedHashSet<>();
+//        Set<String> unitAddressSet = new LinkedHashSet<>();
+//        Set<String> zipCodeSet = new LinkedHashSet<>();
 
         if (equipMainTpe.equals("boiler")){
 
@@ -139,8 +139,8 @@ public class QC01001_202400OFData implements IDynamicOFData {
                             unitNameSet.add(StringUtils.isEmpty(equipBoilerDO.getUnitName()) ? "-" : equipBoilerDO.getUnitName());
                             equipNameSet.add(StringUtils.isEmpty(equipBoilerDO.getEquipName()) ? "-" : equipBoilerDO.getEquipName());
                             productCodeSet.add(StringUtils.isEmpty(equipBoilerDO.getProductCode()) ? "-" : equipBoilerDO.getProductCode());
-                            unitAddressSet.add(StringUtils.isEmpty(equipBoilerDO.getUnitAddress()) ? "-" : equipBoilerDO.getUnitAddress());
-                            zipCodeSet.add(StringUtils.isEmpty(equipBoilerDO.getZipCode()) ? "-" : equipBoilerDO.getZipCode());
+//                            unitAddressSet.add(StringUtils.isEmpty(equipBoilerDO.getUnitAddress()) ? "-" : equipBoilerDO.getUnitAddress());
+//                            zipCodeSet.add(StringUtils.isEmpty(equipBoilerDO.getZipCode()) ? "-" : equipBoilerDO.getZipCode());
 
                             String boilerType = "";
                             DictDataRespDTO boilerTypeDTO = dictDataApi.getDictData("system_equip_boiler_type",equipBoilerDO.getType().toString()).getData();
@@ -157,8 +157,8 @@ public class QC01001_202400OFData implements IDynamicOFData {
                     result.put("unitName", String.join(",", unitNameSet));
                     result.put("equipName", String.join(",", equipNameSet));
                     result.put("productCode", String.join(",", productCodeSet));
-                    result.put("unitAddress", String.join(",", unitAddressSet));
-                    result.put("zipCode", String.join(",", zipCodeSet));
+//                    result.put("unitAddress", String.join(",", unitAddressSet));
+//                    result.put("zipCode", String.join(",", zipCodeSet));
                 }
 
                 result.put("reportNo",itemReportDO.getReportNo());
@@ -280,8 +280,8 @@ public class QC01001_202400OFData implements IDynamicOFData {
                             unitNameSet.add(StringUtils.isEmpty(equipPipeDO.getUnitName()) ? "-" : equipPipeDO.getUnitName());
                             equipNameSet.add(StringUtils.isEmpty(equipPipeDO.getProjectName()) ? "-" : equipPipeDO.getProjectName());
                             productCodeSet.add(StringUtils.isEmpty(equipPipeDO.getProjectNo()) ? "-" : equipPipeDO.getProjectNo());
-                            unitAddressSet.add(StringUtils.isEmpty(equipPipeDO.getUnitAddress()) ? "-" : equipPipeDO.getUnitAddress());
-                            zipCodeSet.add(StringUtils.isEmpty(equipPipeDO.getPostalCode()) ? "-" : equipPipeDO.getPostalCode());
+//                            unitAddressSet.add(StringUtils.isEmpty(equipPipeDO.getUnitAddress()) ? "-" : equipPipeDO.getUnitAddress());
+//                            zipCodeSet.add(StringUtils.isEmpty(equipPipeDO.getPostalCode()) ? "-" : equipPipeDO.getPostalCode());
 
                             String pipeType = "";
                             DictDataRespDTO pipeTypeDTO = dictDataApi.getDictData("PIPE_TYPE",equipPipeDO.getPipeCategory().toString()).getData();
@@ -298,8 +298,8 @@ public class QC01001_202400OFData implements IDynamicOFData {
                     result.put("unitName", String.join(",", unitNameSet));
                     result.put("equipName", String.join(",", equipNameSet));
                     result.put("productCode", String.join(",", productCodeSet));
-                    result.put("unitAddress", String.join(",", unitAddressSet));
-                    result.put("zipCode", String.join(",", zipCodeSet));
+//                    result.put("unitAddress", String.join(",", unitAddressSet));
+//                    result.put("zipCode", String.join(",", zipCodeSet));
 
                 }