cjl
2023-11-07 a3b34f9f092e1aeacfe6bd4c9e80b7464dcd5912
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
@@ -96,6 +96,8 @@
    @ApiModelProperty(value = "能否申请延期")
    private Integer applyState;
    @ApiModelProperty(value = "能否审批")
    private Integer isApprove;
    public static AllocationPageVo convert(AllocationPageExt allocationPageExt) {
        AllocationPageVo allocationPageVo = BeanConverts.convert(allocationPageExt, AllocationPageVo.class);
@@ -107,7 +109,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);