|
@@ -125,6 +125,11 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
|
|
|
columnMap.put("nd",tasknoAndNd.getNd());
|
|
|
// columnMap.put("taskno",tasknoAndNd.getTaskno());
|
|
|
// swfService.removeByMap(columnMap);
|
|
|
+ // 如果导入的年份在数据库当中存在,则删除掉该年份的数据,然后重新导入
|
|
|
+ int counnt = swfService.getIfHaveThisNd(tasknoAndNd.getNd());
|
|
|
+ if (counnt != 0){
|
|
|
+ swfService.deleteSwfByNd(tasknoAndNd.getNd());
|
|
|
+ }
|
|
|
}
|
|
|
swfService.saveBatch(swfList);
|
|
|
for(TasknoAndNd tasknoAndNd : tnZYFList){
|
|
@@ -132,6 +137,10 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
|
|
|
columnMap.put("nd",tasknoAndNd.getNd());
|
|
|
// columnMap.put("taskno",tasknoAndNd.getTaskno());
|
|
|
// zyfService.removeByMap(columnMap);
|
|
|
+ int count = zyfService.getIfHaveThisNd(tasknoAndNd.getNd());
|
|
|
+ if (count != 0){
|
|
|
+ zyfService.deleteZyfByNd(tasknoAndNd.getNd());
|
|
|
+ }
|
|
|
}
|
|
|
zyfService.saveBatch(zyfList);
|
|
|
for(TasknoAndNd tasknoAndNd : tnWXFList){
|
|
@@ -139,13 +148,17 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
|
|
|
columnMap.put("nd",tasknoAndNd.getNd());
|
|
|
// columnMap.put("taskno",tasknoAndNd.getTaskno());
|
|
|
// wxfService.removeByMap(columnMap);
|
|
|
+ int count = wxfService.getIfHaveThisNd(tasknoAndNd.getNd());
|
|
|
+ if (count != 0){
|
|
|
+ wxfService.deleteWxfByNd(tasknoAndNd.getNd());
|
|
|
+ }
|
|
|
}
|
|
|
wxfService.saveBatch(wxfList);
|
|
|
- log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
|
|
+ log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒," + "数据行数:" + list.size());
|
|
|
//update-end-author:taoyan date:20190528 for:批量插入数据
|
|
|
- swfService.deleteSwf();
|
|
|
- wxfService.deleteWxf();
|
|
|
- zyfService.deleteZyf();
|
|
|
+ //swfService.deleteSwf();
|
|
|
+ //wxfService.deleteWxf();
|
|
|
+ //zyfService.deleteZyf();
|
|
|
return Result.ok("文件导入成功!数据行数:" + list.size());
|
|
|
} catch (Exception e) {
|
|
|
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
|