guarantee-lsq 2 years ago
parent
commit
cd8034b5a2

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -48,7 +48,7 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 设备等级
      */
-    @Excel(name = "设备等级", orderNum = "6", dicCode="SBINFO_LEVEL")
+    @Excel(name = "设备等级(1:A级,2:B级,3:C级)", orderNum = "6", dicCode="SBINFO_LEVEL")
     private Integer level;
     /**
      * 设备原值
@@ -103,7 +103,7 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 状态
      */
-    @Excel(name = "状态", orderNum = "17", dicCode="SB_INFO_STATUS")
+    @Excel(name = "状态(1在库,2使用中,4已报废,7停用中,11丢失)", orderNum = "17", dicCode="SB_INFO_STATUS")
     private Integer status;
     /**
      * 备注

+ 6 - 3
platform-service/src/main/java/com/platform/service/excel/SbPartExcelImport.java

@@ -3,11 +3,14 @@ package com.platform.service.excel;
 import cn.hutool.core.collection.CollectionUtil;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.dao.entity.part.PartInfo;
+import com.platform.dao.entity.part.PartType;
 import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.mapper.part.PartInfoMapper;
+import com.platform.dao.mapper.part.PartTypeMapper;
 import com.platform.dao.mapper.sb.SbTypeMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.part.ExportPartInfoVO;
+import com.platform.dao.vo.export.part.ExportPartTypeVO;
 import com.platform.dao.vo.export.sb.ExportSbTypeVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +27,7 @@ import java.util.List;
 @Slf4j
 public class SbPartExcelImport implements ExcelImportStrategy {
 
-    private final PartInfoMapper mapper;
+    private final PartTypeMapper mapper;
 
     @Override
     public Integer getType() {
@@ -33,10 +36,10 @@ public class SbPartExcelImport implements ExcelImportStrategy {
 
     @Override
     public int handler(InputStream inputStream) {
-        List<ExportPartInfoVO> list = ExcelUtil.importExcel(inputStream, ExportPartInfoVO.class, 1);
+        List<ExportPartTypeVO> list = ExcelUtil.importExcel(inputStream, ExportPartTypeVO.class, 1);
         if(CollectionUtil.isNotEmpty(list)){
             list.forEach(item->log.info(item.toString()));
-            mapper.insertListforComplex(BeanConverterUtil.copyListProperties(list, PartInfo.class));
+            mapper.insertListforComplex(BeanConverterUtil.copyListProperties(list, PartType.class));
             return list.size();
         }
         return 0;