|
@@ -561,7 +561,7 @@ public class ExcelTabController extends BladeController {
|
|
|
String thmlUrl = file_path + "/privateUrlCopy/" + aPrivate.getProjectId()+"/"+filecode + ".html";
|
|
|
File file_out = ResourceUtil.getFile(thmlUrl);
|
|
|
if(!file_out.exists()){
|
|
|
- new File(thmlUrl).createNewFile();
|
|
|
+ FileUtils.ensureFileExists(thmlUrl);
|
|
|
}
|
|
|
FileUtil.copy(file_in, file_out);
|
|
|
updateWrapper.set("html_url", thmlUrl);
|
|
@@ -2003,7 +2003,7 @@ public class ExcelTabController extends BladeController {
|
|
|
|
|
|
//公式填充
|
|
|
this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeId), ExecuteType.INSPECTION);
|
|
|
- RandomNumberHolder.clear();
|
|
|
+ RandomNumberHolder.RandomNumberclear();
|
|
|
assert tableInfoList != null;
|
|
|
if (tableInfoList.size() == 0) {
|
|
|
R.success("数据未发生变化");
|
|
@@ -2012,6 +2012,8 @@ public class ExcelTabController extends BladeController {
|
|
|
executionTime.info("公式耗时");
|
|
|
//保存数据到数据库
|
|
|
R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList);
|
|
|
+ RandomNumberHolder.RandomTemplateTypeclear();
|
|
|
+ RandomNumberHolder.RandomWbsTreeContractclear();
|
|
|
if (!result.isSuccess()) {
|
|
|
return R.fail(result.getMsg());
|
|
|
}
|