jinpengyong
2023-11-07 d0e7c0db0392087242e31cdc8ec46a140d6018ae
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;
@@ -75,12 +76,15 @@
    private String stateName;
    public Integer getResidueDay() {
        int day = this.changeDay;
       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;
    }
    public static AppAllocationFindVo convert(AllocationPageExt allocationPageExt) {