From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
index 7755185..845e3a3 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.vo.allocation;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.enums.AllocationApproveEnum;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.utils.BeanConverts;
@@ -14,6 +15,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -38,6 +40,7 @@
private String allocationNum;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date escalationTime;
@ApiModelProperty(value = "������������id")
@@ -77,6 +80,7 @@
private String createName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "���������id")
@@ -86,11 +90,17 @@
private String updateName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "������������������")
private Integer applyState;
+ @ApiModelProperty(value = "������������")
+ private Integer isApprove;
+
+ @ApiModelProperty(value = "pc���������������������")
+ private String isCode;
public static AllocationPageVo convert(AllocationPageExt allocationPageExt) {
AllocationPageVo allocationPageVo = BeanConverts.convert(allocationPageExt, AllocationPageVo.class);
@@ -102,7 +112,7 @@
}
public Integer getResidueDay() {
- int day = this.changeDay;
+ int day = Objects.isNull(this.changeDay)?0:this.changeDay;
if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
Date date = new Date();
int days = DateUtils.getDays(escalationTime, date);
--
Gitblit v1.8.0