Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !347

quality-review/src/main/java/com/ruoyi/web/ReviewEnterpriseArchiveController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ReviewEnterpriseArchive;
 import com.ruoyi.domain.vo.EnterpriseImportFileVO;
@@ -117,10 +118,14 @@ public class ReviewEnterpriseArchiveController extends BaseController {
     @ApiOperation("车企文件导入")
     @RequestMapping(method = RequestMethod.POST, value = "/importExcel")
     public R<String> importEnterprise(HttpServletResponse response,ImportEnterpriseRequest request) throws IOException {
-        ExcelUtil<EnterpriseImportFileVO> util = new ExcelUtil<>(EnterpriseImportFileVO.class);
-        List<EnterpriseImportFileVO> list = util.importExcel(request.getFile().getInputStream());
-        reviewEnterpriseArchiveService.importEnterprise(list, request.getTaskId(),response);
-        return R.ok();
+        try{
+            ExcelUtil<EnterpriseImportFileVO> util = new ExcelUtil<>(EnterpriseImportFileVO.class);
+            List<EnterpriseImportFileVO> list = util.importExcel(request.getFile().getInputStream());
+            reviewEnterpriseArchiveService.importEnterprise(list, request.getTaskId(),response);
+            return R.ok();
+        }catch (Exception e){
+            throw new ServiceException("文件有误请重新上传！");
+        }
     }
 
 }