Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 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,30 @@

    @ApiModelProperty(value = "状态名字")
    private String stateName;
    //上报单位名字
    private String escalationUnitName;

    @ApiModelProperty(value = "纬度")
    private String latitude;

    @ApiModelProperty(value = "经度")
    private String longitude;

    @ApiModelProperty(value = "省市区地址")
    private String address;

    @ApiModelProperty(value = "详细地址")
    private String name;

    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;
    }