xuzhancheng vor 3 Wochen
Ursprung
Commit
8a6a47a2cc

+ 19 - 3
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/EquipPipeController.java

@@ -120,9 +120,25 @@ public class EquipPipeController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<EquipPipeDO> list = equipPipeService.getEquipPipePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "管道设备.xls", "数据", EquipPipeRespVO.class,
-                        BeanUtils.toBean(list, EquipPipeRespVO.class));
+        
+        List<EquipPipeExportVO> exportList = new ArrayList<>();
+        for (EquipPipeDO pipeDO : list) {
+            EquipPipeExportVO exportVO = BeanUtils.toBean(pipeDO, EquipPipeExportVO.class);
+            
+            Area area = AreaUtils.getArea(pipeDO.getEquipDistrict());
+            if (area != null) {
+                exportVO.setEquipDistrictName(area.getName());
+            }
+            
+            area = AreaUtils.getArea(pipeDO.getEquipStreet());
+            if (area != null) {
+                exportVO.setEquipStreetName(area.getName());
+            }
+            
+            exportList.add(exportVO);
+        }
+        
+        ExcelUtils.write(response, "管道设备.xls", "数据", EquipPipeExportVO.class, exportList);
     }
     @GetMapping("/getHistoryPipeEquipment")
     @Operation(summary = "获得历史容器管道设备")

+ 52 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/vo/EquipPipeExportVO.java

@@ -0,0 +1,52 @@
+package cn.start.tz.module.pressure2.controller.admin.equippipe.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import cn.start.tz.framework.excel.core.annotations.DictFormat;
+import cn.start.tz.framework.excel.core.convert.DictConvert;
+
+@Schema(description = "管理后台 - 管道设备导出 VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EquipPipeExportVO {
+
+    @Schema(description = "区域名称")
+    @ExcelProperty("区域")
+    private String equipDistrictName;
+
+    @Schema(description = "街道名称")
+    @ExcelProperty("街道")
+    private String equipStreetName;
+
+    @Schema(description = "工程号")
+    @ExcelProperty("工程号")
+    private String projectNo;
+
+    @Schema(description = "工程名称")
+    @ExcelProperty("工程名称")
+    private String projectName;
+
+    @Schema(description = "使用证号")
+    @ExcelProperty("使用证号")
+    private String certificateNo;
+
+    @Schema(description = "单位名称")
+    @ExcelProperty("单位名称")
+    private String unitName;
+
+    @Schema(description = "管道使用地址")
+    @ExcelProperty("管道使用地址")
+    private String pipeAddress;
+
+    @Schema(description = "管道类别")
+    @ExcelProperty(value = "管道类别", converter = DictConvert.class)
+    @DictFormat("PIPE_TYPE")
+    private String pipeCategory;
+
+    @Schema(description = "使用状态")
+    @ExcelProperty(value = "使用状态", converter = DictConvert.class)
+    @DictFormat("system_equip_boiler_status")
+    private String useStatus;
+}