From 471f693ac87a6ed6a2b00e93472b025266c0271f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 09:27:19 +0800
Subject: [PATCH] Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa

---
 screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
index b5fb539..00c0cbb 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.moral.api.pojo.enums.AllocationApproveEnum;
+import com.moral.api.pojo.enums.ChangeEnum;
 import com.moral.api.pojo.ext.allocation.AllocationPageExt;
 import com.moral.api.pojo.vo.allocation.AllocationPageVo;
 import com.moral.api.utils.BeanConverts;
@@ -73,13 +74,18 @@
 
     @ApiModelProperty(value = "������������")
     private String stateName;
+    //������������������
+    private String escalationUnitName;
 
     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;
+       int day=0;
+        if (this.changeType==ChangeEnum.DEADLINE.value){
+             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