From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java | 7 ++++++-
1 files changed, 6 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 3264fd6..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
@@ -96,6 +96,11 @@
@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);
@@ -107,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