From 2ef834ebf40351ed68d0ef20cd8fda10a7af8cdb Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Fri, 23 Feb 2024 11:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1=EF=BC=9A=E3=80=90ID1000466?=
 =?UTF-8?q?=E3=80=91=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86-=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7=E5=88=97=E8=A1=A8=EF=BC=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BB=85=E6=94=AF=E6=8C=81=E5=A1=AB=E5=86=99=E3=80=90=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=97=A0=E6=95=88=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../req/WxInstrumentSerialImportVm.java       |  3 ++-
 .../InstrumentSerialValidStatusAdapter.java   | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/poi/InstrumentSerialValidStatusAdapter.java

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSerialImportVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSerialImportVm.java
index 2ca6648..78094f4 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSerialImportVm.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSerialImportVm.java
@@ -2,6 +2,7 @@ package com.flossom.common.core.domain.req;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.Type;
+import com.flossom.common.core.utils.poi.InstrumentSerialValidStatusAdapter;
 
 
 import java.util.Date;
@@ -23,7 +24,7 @@ public class WxInstrumentSerialImportVm {
     private String serial;
 
     /** 序列号有效状态，1有效，0无效 */
-    @Excel(name = "有效状态:1有效，0无效",type = Type.IMPORT, combo = {"1","0"})
+    @Excel(name = "有效状态:1有效，0无效",type = Type.IMPORT, combo = {"有效","无效"}, handler = InstrumentSerialValidStatusAdapter.class)
     private String validStatus;
 
 
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/poi/InstrumentSerialValidStatusAdapter.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/poi/InstrumentSerialValidStatusAdapter.java
new file mode 100644
index 0000000..7ee8f0a
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/poi/InstrumentSerialValidStatusAdapter.java
@@ -0,0 +1,25 @@
+package com.flossom.common.core.utils.poi;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Workbook;
+
+/**
+ * {@link com.flossom.common.core.domain.req.WxInstrumentSerialImportVm#validStatus}
+ */
+public class InstrumentSerialValidStatusAdapter implements ExcelHandlerAdapter {
+
+
+    @Override
+    public Object format(Object value, String[] args, Cell cell, Workbook wb) {
+        String v = (String) value;
+        if (StringUtils.equals(v, "有效")) {
+            return 1;
+        }
+        if (StringUtils.equals(v, "无效")) {
+            return 0;
+        }
+        return null;
+    }
+
+}