报表服务调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12016_202400ReportOFData.java

@@ -123,7 +123,7 @@ public class QC12016_202400ReportOFData implements IDynamicOFData {
                         result.put("securityManPhone",equipPipeDO.getSecurityManPhone());
                         result.put("projectName",equipPipeDO.getProjectName());
                         result.put("postalCode",equipPipeDO.getPostalCode());
-                        result.put("pipeUsePlace",equipPipeDO.getPipeUsePlace());
+                        result.put("pipeUsePlace",equipPipeDO.getPipeAddress());
 
                         result.put("installationStatusReg",equipPipeDO.getInstallationStatusReg());
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12016_202401JRecordOFData.java

@@ -110,7 +110,7 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                     result.put("unitAddress", equipPipeDO.getUnitName());
                     result.put("postalCode", equipPipeDO.getPostalCode());
                     result.put("certificateNo", equipPipeDO.getCertificateNo());
-                    result.put("pipeUsePlace", equipPipeDO.getPipeUsePlace());
+                    result.put("pipeUsePlace", equipPipeDO.getPipeAddress());
                 }
 
                 List<PipeTaskOrderItemDetailDO> allDetailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202400ReportOFData.java

@@ -203,7 +203,7 @@ public class QC12024_202400ReportOFData implements IDynamicOFData {
                         result.put("securityManPhone",equipPipeDO.getSecurityManPhone());
                         result.put("projectName",equipPipeDO.getProjectName());
                         result.put("postalCode",equipPipeDO.getPostalCode());
-                        result.put("pipeUsePlace",equipPipeDO.getPipeUsePlace());
+                        result.put("pipeUsePlace",equipPipeDO.getPipeAddress());
                         result.put("value2",equipPipeDO.getLayingMode());
 
                         DictDataRespDTO dictDataRespDTO = dictDataApi.getDictData("PIPE_TYPE",equipPipeDO.getPipeCategory()).getData();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202403JRecordOFData.java

@@ -122,7 +122,7 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     result.put("unitAddress", equipPipeDO.getUnitName());
                     result.put("postalCode", equipPipeDO.getPostalCode());
                     result.put("certificateNo", equipPipeDO.getCertificateNo());
-                    result.put("pipeUsePlace", equipPipeDO.getPipeUsePlace());
+                    result.put("pipeUsePlace", equipPipeDO.getPipeAddress());
                 }
 
                 List<PipeTaskOrderItemDetailDO> allDetailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12116_202400RecordOFData.java

@@ -99,7 +99,7 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
                     result.put("pipeAddress",equipPipeDO.getPipeAddress());
                     result.put("securityMan",equipPipeDO.getSecurityMan());
                     result.put("relationDeptName",equipPipeDO.getRelationDeptName());
-                    result.put("securityDept",equipPipeDO.getSecurityDept());
+                    result.put("securityDept",equipPipeDO.getDepartment());
                     result.put("contact",equipPipeDO.getContact());
                     result.put("contactPhone",equipPipeDO.getContactPhone());
                     result.put("projectName",equipPipeDO.getProjectName());