From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java |  205 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 205 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
new file mode 100644
index 0000000..2587ab1
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
@@ -0,0 +1,205 @@
+package com.moral.api.pojo.vo.allocation;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
+import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
+import com.moral.api.pojo.vo.file.FileAddressVo;
+import com.moral.api.pojo.vo.file.FileVo;
+import com.moral.api.utils.BeanConverts;
+import com.moral.api.utils.MyStringImageConverterUtil;
+import com.moral.api.utils.MyUrlConverterUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ * deyt template generate
+ * @author JI
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AllocationListExcelVo - ������VO������", description="AllocationListExcelVo - ������VO������")
+public class AllocationListExcelVo implements Serializable {
+
+
+
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String allocationNum;
+
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String escalationTimeStr;
+
+    @ExcelProperty(value = "������������")
+    private String unitName;
+
+    @ExcelProperty(value = "������������")
+    private String polluteTypeName;
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String pollutePosition;
+
+    @ApiModelProperty(value = "������������id")
+    @ExcelProperty(value = "������������")
+    private String changeTypeStr;
+
+    @ApiModelProperty(value = "���������")
+    @ExcelProperty(value = "���������")
+    private String escalationName;
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String problemDescribe;
+
+  /*  @ApiModelProperty(value = "������������")
+    private List<FileAddressVo> fileBaseList;*/
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "���������������",converter = MyStringImageConverterUtil.class)
+    private List<String> writeCellDataFile;
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String changeStr;
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String changeDescribe;
+
+    @ApiModelProperty(value = "���������������")
+    @ExcelProperty(value = "���������������")
+    private String changeName;
+
+    @ApiModelProperty(value = "������������")
+    @ExcelProperty(value = "������������")
+    private String changeTimeStr;
+
+
+    @ExcelProperty(value = "���������������",converter = MyStringImageConverterUtil.class)
+    private List<String> writeCellDataFileResult;
+
+   /* @ApiModelProperty(value = "������������id")
+    private Integer unitId;
+
+    @ApiModelProperty(value = "������������id")
+    private Integer polluteType;
+
+    @ApiModelProperty(value = "������������id")
+    private Integer changeType;
+
+    @ApiModelProperty(value = "������������")
+    private Integer changeDay;
+
+    @ApiModelProperty(value = "������������id")
+    private Integer escalationUnitId;
+
+    @ApiModelProperty(value = "���������")
+    private String escalationName;
+
+    @ApiModelProperty(value = "������������id")
+    private Integer investigationType;
+
+    @ApiModelProperty(value = "������������")
+    private String problemDescribe;
+
+    @ApiModelProperty(value = "������������")
+    private Integer isChange;
+
+    @ApiModelProperty(value = "������������")
+    private String changeDescribe;
+
+    @ApiModelProperty(value = "���������������")
+    private String changeName;
+
+    @ApiModelProperty(value = "������������")
+    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date changeTime;
+
+    @ApiModelProperty(value = "������������")
+    private Integer checkScore;
+
+    @ApiModelProperty(value = "������������")
+    private String checkDescribe;
+
+    @ApiModelProperty(value = "���������")
+    private String checkName;
+
+    @ApiModelProperty(value = "������������")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date checkTime;
+
+    @ApiModelProperty(value = "������")
+    private Integer state;
+
+    @ApiModelProperty(value = "������������")
+    private Integer isInvalid;
+
+    @ApiModelProperty(value = "������������")
+    private String invalidReason;
+
+    @ApiModelProperty(value = "���������id")
+    private Integer createId;
+
+    @ApiModelProperty(value = "���������������")
+    private String createName;
+
+    @ApiModelProperty(value = "������������")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty(value = "���������id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "���������������")
+    private String updateName;
+
+    @ApiModelProperty(value = "������������")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date updateTime;
+
+
+
+    @ApiModelProperty(value = "������������")
+    private List<FileVo> fileChangeList;
+
+    @ApiModelProperty(value = "������������")
+    private List<FileVo> fileApproveList;
+
+    @ApiModelProperty(value = "������������")
+    private List<ApproveTableListVo> approveList;
+
+    @TableField(exist = false)
+    private String time;
+
+    @TableField(exist = false)
+    private String unitName;
+    @TableField(exist = false)
+    private String escalationUnitName;
+    @TableField(exist = false)
+    private String polluteTypeName;*/
+
+
+    public static AllocationListExcelVo convert(AllocationExcelExt allocationExt) {
+        AllocationListExcelVo allocationVo = BeanConverts.convert(allocationExt, AllocationListExcelVo.class);
+        return allocationVo;
+    }
+
+}

--
Gitblit v1.8.0