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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderRespVO.java

@@ -411,4 +411,7 @@ public class BoilerTaskOrderRespVO {
 
     @Schema(description = "检验情况告知表")
     private NotificationformReportDO notificationformReport;
+
+    @Schema(description = "联系电话")
+    private String deptPhone;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/PipeTaskOrderSaveReqVO.java

@@ -174,4 +174,16 @@ public class PipeTaskOrderSaveReqVO {
      *  接收人邮箱
      * */
     private String payerMail;
+
+    @Schema(description = "联系电话")
+    private String deptPhone;
+
+    @Schema(description = "邮政编码")
+    private String useUnitZipcode;
+
+    private String useUnitName;
+
+    private String useUnitSocialCreditCode;
+
+    private String useUnitAddress;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/TaskOrderSaveReqVO.java

@@ -174,4 +174,17 @@ public class TaskOrderSaveReqVO {
      *  接收人邮箱
      * */
     private String payerMail;
+
+    @Schema(description = "联系电话")
+    private String deptPhone;
+
+    @Schema(description = "邮政编码")
+    private String useUnitZipcode;
+
+    private String useUnitName;
+
+    private String useUnitSocialCreditCode;
+
+    private String useUnitAddress;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderRespVO.java

@@ -414,4 +414,6 @@ public class PipeTaskOrderRespVO {
     @Schema(description = "检验情况告知表")
     private NotificationformReportDO notificationformReport;
 
+    @Schema(description = "联系电话")
+    private String deptPhone;
 }

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

@@ -153,12 +153,16 @@ public class QC12171_202401RecordOFData implements IDynamicOFData {
                 result.put("zipCode", equipPipeDO.getPostalCode());
                 result.put("pipeAddress", equipPipeDO.getPipeAddress());
                 result.put("useNo", equipPipeDO.getCertificateNo());
-//                List<String> pipeCategory = equipPipeDOS.stream().map(EquipPipeDO::getPipeCategory).distinct().toList();
-//                List<DictDataRespDTO> pipeType = dictDataApi.getDictDataList("PIPE_TYPE").getCheckedData();
-                // 按/拼接
-//                String pipeCategoryStr = pipeType.stream().filter(dict -> pipeCategory.contains(dict.getValue())).map(DictDataRespDTO::getLabel).distinct().collect(Collectors.joining("/"));
-//                result.put("pipeCategory", pipeCategoryStr);
+                List<String> pipeCategoryList = equipPipeDOS.stream().map(EquipPipeDO::getPipeCategory).distinct().toList();
 
+                if (pipeCategoryList.size() == 1){
+                    DictDataRespDTO pipeType = dictDataApi.getDictData("PIPE_TYPE", pipeCategoryList.get(0)).getCheckedData();
+                    if (pipeType != null){
+                        result.put("pipeCategory", pipeType.getLabel());
+                    }
+                }else{
+                    result.put("pipeCategory", "见一览表");
+                }
 
                 result.put("securityMan", equipPipeDO.getSecurityMan());
                 result.put("contactPhone", equipPipeDO.getContactPhone());
@@ -211,17 +215,17 @@ public class QC12171_202401RecordOFData implements IDynamicOFData {
                             .sum();
                     result.put("pipeLengthTotal", String.valueOf(pipeLengthTotal));
 
-                    String pipeCategory = equipPipeDO.getPipeCategory();
-                    if (StrUtil.isNotBlank(pipeCategory)) {
-                        if ("industry_pipe".equals(pipeCategory)) {
-                            result.put("pipeCategory_1", "true");
-                            result.put("pipeCategory_2", "false");
-                        }
-                        if ("public_pipe".equals(pipeCategory)) {
-                            result.put("pipeCategory_2", "true");
-                            result.put("pipeCategory_1", "false");
-                        }
-                    }
+//                    String pipeCategory = equipPipeDO.getPipeCategory();
+//                    if (StrUtil.isNotBlank(pipeCategory)) {
+//                        if ("industry_pipe".equals(pipeCategory)) {
+//                            result.put("pipeCategory_1", "true");
+//                            result.put("pipeCategory_2", "false");
+//                        }
+//                        if ("public_pipe".equals(pipeCategory)) {
+//                            result.put("pipeCategory_2", "true");
+//                            result.put("pipeCategory_1", "false");
+//                        }
+//                    }
                 }
             }