From b9086588c215b7493682d65d49ed1070d88c3058 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb

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

diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
new file mode 100644
index 0000000..5dfca31
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -0,0 +1,144 @@
+package com.moral.api.pojo.vo.allocation;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.api.pojo.ext.allocation.AllocationExt;
+import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
+import com.moral.api.pojo.vo.file.FileVo;
+import com.moral.api.utils.BeanConverts;
+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.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="Allocation - ������VO������", description="Allocation - ������VO������")
+public class AllocationVo implements Serializable {
+
+
+    @ApiModelProperty(value = "������id")
+    private Integer allocationId;
+
+    @ApiModelProperty(value = "������������")
+    private String allocationNum;
+
+
+    @ApiModelProperty(value = "������������")
+    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date escalationTime;
+
+    @ApiModelProperty(value = "������������")
+    private String pollutePosition;
+
+    @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> fileBaseList;
+
+    @ApiModelProperty(value = "������������")
+    private List<FileVo> fileChangeList;
+
+    @ApiModelProperty(value = "������������")
+    private List<FileVo> fileApproveList;
+
+    @ApiModelProperty(value = "������������")
+    private List<ApproveTableListVo> approveList;
+
+
+    public static AllocationVo convert(AllocationExt allocationExt) {
+        AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
+        return allocationVo;
+    }
+
+}

--
Gitblit v1.8.0