|
@@ -7,6 +7,8 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.excel.ExcelWriter;
|
|
|
+import com.alibaba.excel.exception.ExcelAnalysisException;
|
|
|
+import com.alibaba.excel.exception.ExcelDataConvertException;
|
|
|
import com.alibaba.excel.write.metadata.WriteSheet;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -2736,8 +2738,14 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
@Override
|
|
|
public R workShopImport(MultipartFile multipartFile, HttpServletResponse response) throws IOException {
|
|
|
WorkShopImportListener listener = new WorkShopImportListener();
|
|
|
- // 读取数据
|
|
|
- EasyExcel.read(multipartFile.getInputStream(), WorkShopExportVo.class, listener).sheet().headRowNumber(1).doRead();
|
|
|
+ try {
|
|
|
+ // 读取数据
|
|
|
+ EasyExcel.read(multipartFile.getInputStream(), WorkShopExportVo.class, listener).sheet().headRowNumber(1).doRead();
|
|
|
+ } catch (ExcelDataConvertException e) {
|
|
|
+ String errorMessage = "第" + (e.getRowIndex() + 1) + "行,第" + (e.getColumnIndex()+1) + "列,数据错误,请检查:\n\r"+e.getCellData().getStringValue();
|
|
|
+ log.error("导入文件错误," + errorMessage);
|
|
|
+ return R.error(errorMessage);
|
|
|
+ }
|
|
|
// 解析有误信息
|
|
|
List<String> errorData = listener.getErrorMessages();
|
|
|
if (!errorData.isEmpty()) {
|