Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-10-18 c4c904031919bd0456cd14fca583d9fa9eea40d8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java

@@ -5,6 +5,7 @@
import java.util.Date;

import com.alibaba.excel.annotation.ExcelProperty;
import com.panzhihua.common.utlis.StringUtils;

import lombok.Data;

@@ -51,11 +52,15 @@
    private String status;

    public void setIsAnonymous(String isAnonymous) {
        this.isAnonymous = nonNull(isAnonymous) && isAnonymous.equals("1") ? "是" : "否";
        if (StringUtils.isNumber(isAnonymous)) {
            this.isAnonymous = nonNull(isAnonymous) && isAnonymous.equals("1") ? "是" : "否";
        } else {
            this.isAnonymous = isAnonymous;
        }
    }

    public void setStatus(String status) {
        if (nonNull(status)) {
        if (StringUtils.isNumber(isAnonymous)) {
            switch (status) {
                case "1":
                    this.status = "待签收";
@@ -67,6 +72,8 @@
                    this.status = "已取消";
                    break;
            }
        } else {
            this.status = status;
        }
    }
}