From a7ebf0ce7082e68f4aaf8a7a0e3e5e6c48dfaadb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 18 十月 2021 10:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
index 167be9c..2e4c4a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
@@ -3,6 +3,7 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.converters.string.StringImageConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.utlis.StringUtils;
 import lombok.Data;
 
 import java.net.URL;
@@ -98,4 +99,24 @@
      */
     @ExcelProperty(value = "物品图片",index = 5)
     private URL image;
+
+    public void setStatus(String status) {
+        if(StringUtils.isNotEmpty(status)){
+            if("-1".equals(status)){
+                status="已取消";
+            }else if("0".equals(status)){
+                status="待处理";
+            }
+            else if("1".equals(status)){
+                status="待领取";
+            }
+            else if("2".equals(status)){
+                status="已驳回";
+            }
+            else if("3".equals(status)){
+                status="已领取";
+            }
+            this.status=status;
+        }
+    }
 }

--
Gitblit v1.7.1