From ac87f61568a68501aa50d5c3f0d083e8ea36ebb3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 29 十一月 2024 14:33:07 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java
index 05bb328..3b23cda 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java
@@ -1,12 +1,21 @@
package com.dy.pipIrrGlobal.voUg;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
+import java.util.Date;
/**
* @Author: liurunyu
@@ -15,50 +24,68 @@
*/
@Data
-@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "isOver", "isOverStr", "ugState", "ugStateStr", "overDt"})
+@HeadRowHeight(26)
+@ContentRowHeight(22)
+@JsonPropertyOrder({ "id", "intakeNum", "rtuAddr", "isOverStr", "ugStateStr", "overDt"})
public class VoUgResult {
/**
* 涓婚敭
*/
@Schema(description = "涓婚敭" )
@JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @ExcelIgnore()
public Long id;
/**
* 鎺у埗鍣ㄥ湴鍧�
*/
@Schema(description = "鎺у埗鍣ㄥ湴鍧�" )
+ @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
+ @ColumnWidth(20)
+ @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
public String rtuAddr;
/**
* 鍙栨按缂栧彿
*/
@Schema(description = "鍙栨按鍙ｇ紪鍙�")
+ @ExcelProperty("鍙栨按缂栧彿")
+ @ColumnWidth(20)
+ @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
private String intakeNum;
/**
* 鍗囩骇鏄惁缁撴潫
*/
@Schema(description = "鍗囩骇鏄惁缁撴潫" )
+ @JSONField(serialize = false)
+ @ExcelIgnore()
public Byte isOver;
/**
* 鍗囩骇鏄惁缁撴潫
*/
@Schema(description = "鍗囩骇鏄惁缁撴潫" )
- @TableField(exist = false)
+ @ExcelProperty("鍗囩骇缁撴潫")
+ @ColumnWidth(10)
+ @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
public String isOverStr;
/**
* 鍗囩骇鐘舵��
*/
@Schema(description = "鍗囩骇鐘舵��" )
+ @JSONField(serialize = false)
+ @ExcelIgnore()
public Integer ugState;
/**
* 鍗囩骇鐘舵��
*/
@Schema(description = "鍗囩骇鐘舵��" )
+ @ExcelProperty("鍗囩骇缁撴灉")
+ @ColumnWidth(16)
+ @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
public String ugStateStr;
/**
@@ -66,7 +93,10 @@
*/
@Schema(description = "鍗囩骇缁撴潫鏃堕棿" )
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
- public Integer overDt;
+ @ExcelProperty("缁撴潫鏃堕棿")
+ @ColumnWidth(30)
+ @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
+ public Date overDt;
/**
* 鏃犲弬鏁版嵁鏋勯�犳柟娉�
--
Gitblit v1.8.0