From 6ab3d49daeeb6b10e0bdedd9fbb6735491248cfd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 20 Nov 2023 13:00:07 +0800
Subject: [PATCH] fix：五分钟数据过滤
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java | 5 ++++-
1 files changed, 4 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 7aede07..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
@@ -99,6 +99,9 @@
@ApiModelProperty(value = "������������")
private Integer isApprove;
+ @ApiModelProperty(value = "pc���������������������")
+ private String isCode;
+
public static AllocationPageVo convert(AllocationPageExt allocationPageExt) {
AllocationPageVo allocationPageVo = BeanConverts.convert(allocationPageExt, AllocationPageVo.class);
return allocationPageVo;
@@ -109,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