From a3eaa78c6d839b640c728f4c7d8eb27732627b07 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
new file mode 100644
index 0000000..7e443a3
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
@@ -0,0 +1,79 @@
+package com.moral.api.pojo.vo.allocation;
+
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.api.pojo.enums.AllocationApproveEnum;
+import com.moral.util.DateUtils;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="Allocation - ������VO������", description="Allocation - ������VO������")
+public class AllocationFindVo 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 = "������������id")
+ private Integer unitId;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer polluteType;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer changeType;
+
+ @ApiModelProperty(value = "������������")
+ private Integer changeDay;
+
+ @ApiModelProperty(value = "������������")
+ private Integer residueDay;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer escalationUnitId;
+
+ @ApiModelProperty(value = "���������")
+ private String escalationName;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer investigationType;
+
+ @ApiModelProperty(value = "������")
+ private Integer state;
+
+ @ApiModelProperty(value = "������������")
+ private Integer isInvalid;
+
+ @ApiModelProperty(value = "������������")
+ private Integer isApprove;
+
+ @ApiModelProperty(value = "������������")
+ private String stateName;
+
+ public Integer getResidueDay() {
+ int day = this.changeDay;
+ if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
+ Date date = new Date();
+ int days = DateUtils.getDays(escalationTime, date);
+ return day-days;
+ }
+ return day;
+ }
+
+}
--
Gitblit v1.8.0