【ID1000396】仪器管理-序列号列表导入，状态为空和异常输入，均导入成功，为空导入后状态为有效，异常输入导入后状态为无效

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.InstrumentSerialAdapter;
 import com.flossom.common.core.utils.poi.InstrumentSerialValidStatusAdapter;
 
 
@@ -20,11 +21,11 @@ public class WxInstrumentSerialImportVm {
     private String source;
 
     /** 序列号 */
-    @Excel(name = "序列号",type = Type.IMPORT)
+    @Excel(name = "序列号",type = Type.IMPORT, handler = InstrumentSerialAdapter.class)
     private String serial;
 
     /** 序列号有效状态，1有效，0无效 */
-    @Excel(name = "有效状态:1有效，0无效",type = Type.IMPORT, combo = {"有效","无效"}, handler = InstrumentSerialValidStatusAdapter.class)
+    @Excel(name = "有效状态(默认为有效)",type = Type.IMPORT,defaultValue = "1", combo = {"有效","无效"}, handler = InstrumentSerialValidStatusAdapter.class)
     private String validStatus;
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/poi/InstrumentSerialAdapter.java

@@ -0,0 +1,21 @@
+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 InstrumentSerialAdapter implements ExcelHandlerAdapter {
+
+
+    @Override
+    public Object format(Object value, String[] args, Cell cell, Workbook wb) {
+        if(StringUtils.isBlank(((String) value).trim())) {
+            return null;
+        }
+        return ((String) value).trim();
+    }
+
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/poi/InstrumentSerialValidStatusAdapter.java

@@ -19,7 +19,7 @@ public class InstrumentSerialValidStatusAdapter implements ExcelHandlerAdapter {
         if (StringUtils.equals(v, "无效")) {
             return 0;
         }
-        return null;
+        return 1;
     }
 
 }