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/QC47025_202400RecordOFData.java

@@ -95,18 +95,22 @@ public class QC47025_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -95,18 +95,22 @@ public class QC47026_202401RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -105,12 +105,16 @@ public class QC47028_202400RecordOFData implements IDynamicOFData {
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -95,18 +95,22 @@ public class QC47029_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -98,18 +98,22 @@ public class QC47031_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -95,18 +95,22 @@ public class QC47034_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -113,18 +113,22 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -118,18 +118,22 @@ public class QC52044_202401RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -121,18 +121,22 @@ public class QC52045_202401RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -110,18 +110,22 @@ public class QC52046_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -109,18 +109,22 @@ public class QC52047_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -122,18 +122,22 @@ public class QC52049_202402RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }

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

@@ -99,18 +99,22 @@ public class QC52054_202400RecordOFData implements IDynamicOFData {
 
             if (itemReportDO != null) {
                 //根据记录字段动态生成报告字段
-                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
                     //设备信息
+                    EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                    if (equipDO != null){
+                        result.put("unitName",equipDO.getUnitName());
+                    }
+
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                     }else {
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
+                        if (equipDO != null) {
+                            result.put("equipCode", equipDO.getProjectNo());
                         }
                     }
                 }