jinpengyong
2023-11-14 931734244f977a65dd35c6f606afb999d7c3c967
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);