Commit 4625c1a3 authored by hongguangwu's avatar hongguangwu

MVP1.7.1 优化预入职

parent c180b2d3
...@@ -115,6 +115,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -115,6 +115,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
return this.salaryUploadCore(vo); return this.salaryUploadCore(vo);
} catch (Exception e){ } catch (Exception e){
log.error("薪资导入异常:",e); log.error("薪资导入异常:",e);
return R.failed("薪资导入异常,请检查表数据");
} finally { } finally {
importTwoAtomicInteger.decrementAndGet(); importTwoAtomicInteger.decrementAndGet();
} }
...@@ -124,7 +125,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -124,7 +125,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
log.error("超出阈值:"+ ResultConstants.IMPORT_DOWN_LOAD_DATA); log.error("超出阈值:"+ ResultConstants.IMPORT_DOWN_LOAD_DATA);
return R.failed("薪资导入," + ResultConstants.IMPORT_DOWN_LOAD_DATA); return R.failed("薪资导入," + ResultConstants.IMPORT_DOWN_LOAD_DATA);
} }
return R.failed("薪资导入," + ResultConstants.IMPORT_DOWN_LOAD_DATA);
} }
private R<List<ErrorMessage>> salaryUploadCore(SalaryUploadParamVo vo) { private R<List<ErrorMessage>> salaryUploadCore(SalaryUploadParamVo vo) {
......
...@@ -804,6 +804,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -804,6 +804,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return this.getExcelContent(file, excelVo); return this.getExcelContent(file, excelVo);
} catch (Exception e){ } catch (Exception e){
log.error("薪资原表识别异常:",e); log.error("薪资原表识别异常:",e);
return R.failed("薪资原表识别异常,请检查表数据");
} finally { } finally {
importAtomicInteger.decrementAndGet(); importAtomicInteger.decrementAndGet();
} }
...@@ -813,7 +814,6 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -813,7 +814,6 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
log.error("超出阈值:"+ ResultConstants.IMPORT_DOWN_LOAD_DATA); log.error("超出阈值:"+ ResultConstants.IMPORT_DOWN_LOAD_DATA);
return R.failed("薪资原表识别," + ResultConstants.IMPORT_DOWN_LOAD_DATA); return R.failed("薪资原表识别," + ResultConstants.IMPORT_DOWN_LOAD_DATA);
} }
return R.failed("薪资原表识别中," + ResultConstants.IMPORT_DOWN_LOAD_DATA);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment