导入bug fix

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/api/exception/BusinessException.java

@@ -36,7 +36,4 @@ public class BusinessException extends RuntimeException {
         super(ex);
     }
 
-    public String getMsg(){
-        return errorCodeEnum.getMessage();
-    }
 }

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/preperties/FactoryProperty.java

@@ -3,7 +3,6 @@ package com.abi.task.common.excel.preperties;
 
 import com.abi.task.common.excel.common.AbstractExcelProperty;
 import com.abi.task.common.excel.common.ExcelHeadAlias;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,28 +12,28 @@ import lombok.Data;
 @Data
 public class FactoryProperty implements AbstractExcelProperty {
 
-    @ApiModelProperty(value = "供应商id")
+    @ExcelHeadAlias(value = "供应商id(必填)")
     private String factoryCode;
 
-    @ApiModelProperty(value = "供应商名称")
+    @ExcelHeadAlias(value = "供应商名称(必填)")
     private String factoryName;
 
-    @ApiModelProperty(value = "供应商类型 1-包材厂 2-啤酒厂")
+    @ExcelHeadAlias(value = "供应商类型(必填) 枚举值:包材厂,啤酒厂")
     private String factoryType;
 
-    @ApiModelProperty(value = "联系人姓名")
+    @ExcelHeadAlias(value = "联系人姓名(必填)")
     private String keymanName;
 
-    @ApiModelProperty(value = "联系人手机号")
+    @ExcelHeadAlias(value = "联系人手机号(必填)")
     private String keymanMobile;
 
-    @ApiModelProperty(value = "邮箱")
+    @ExcelHeadAlias(value = "邮箱(必填)")
     private String email;
 
-    @ApiModelProperty(value = "文件最大数")
+    @ExcelHeadAlias(value = "文件最大数")
     private String maxFileCount;
 
-    @ApiModelProperty(value = "描述")
+    @ExcelHeadAlias(value = "描述")
     private String description;
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/DepartmentController.java

@@ -28,6 +28,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
+@RequestMapping("dept")
 @Api(tags = "部门管理")
 public class DepartmentController {
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FactoryController.java

@@ -17,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -28,6 +29,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
+@RequestMapping("factory")
 @Api(tags = "供应商管理")
 public class FactoryController {
 
@@ -79,6 +81,13 @@ public class FactoryController {
         return BaseResponse.create();
     }
 
+    @ResponseBody
+    @ApiOperation(value = "导出模板")
+    @GetMapping("downloadExcelModel")
+    public void downloadExcelModel(HttpServletResponse response) throws Exception {
+        ExcelInputFactory.downloadExcelModel("供应商模板", response, FactoryProperty.class);
+    }
+
     @ApiOperation("excel批量导入")
     @PostMapping("factoryExcelImport")
     public BaseResponse factoryExcelImport(@RequestParam("file") MultipartFile file) throws Exception{

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/DepartmentServiceImpl.java

@@ -192,7 +192,7 @@ public class DepartmentServiceImpl implements DepartmentService {
 
                 saveDept(req);
             }catch (BusinessException e){
-                failList.add(new ExcelImportRes.FailBean(i+2,e.getMsg()));
+                failList.add(new ExcelImportRes.FailBean(i+2,e.getMessage()));
             }
         }
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -201,7 +201,7 @@ public class FactoryServiceImpl implements FactoryService {
 
                 saveFactory(req);
             }catch (BusinessException e){
-                failList.add(new ExcelImportRes.FailBean(i+2,e.getMsg()));
+                failList.add(new ExcelImportRes.FailBean(i+2,e.getMessage()));
             }
         }