|
@@ -2219,9 +2219,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
//String fileName = "项目成本工时统计_"+System.currentTimeMillis();
|
|
|
String fileName = null;
|
|
|
if (withMainProject == 1) {
|
|
|
- fileName = "主项目成本工时统计"+System.currentTimeMillis();
|
|
|
+ fileName = "主项目成本工时统计" +(startDate==null?"":(startDate+MessageUtils.message("leave.to")+endDate))+System.currentTimeMillis();
|
|
|
} else {
|
|
|
- fileName = MessageUtils.message("fileName.projectCost")+System.currentTimeMillis();
|
|
|
+ fileName = (startDate==null?"":(startDate+MessageUtils.message("leave.to")+endDate)) + MessageUtils.message("fileName.projectCost")+System.currentTimeMillis();
|
|
|
}
|
|
|
|
|
|
return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,dingding,fileName , allList, path);
|
|
@@ -8227,7 +8227,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
}
|
|
|
//生成excel文件导出
|
|
|
//String fileName = "项目分类工时成本统计_"+System.currentTimeMillis();
|
|
|
- String fileName = MessageUtils.message("fileName.proClassLaborCost")+System.currentTimeMillis();
|
|
|
+ String fileName = (startDate==null?"":(startDate+MessageUtils.message("leave.to")+endDate)) + MessageUtils.message("fileName.proClassLaborCost")+System.currentTimeMillis();
|
|
|
try {
|
|
|
return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,dingding,fileName , allList, path);
|
|
|
} catch (Exception e) {
|
|
@@ -11789,7 +11789,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
allList.add(sumRow);
|
|
|
//生成excel文件导出
|
|
|
//String fileName = "维度成本工时统计_"+System.currentTimeMillis();
|
|
|
- String fileName = timeType.getCustomDegreeName() + MessageUtils.message("fileName.degreeCost")+System.currentTimeMillis();
|
|
|
+ String fileName = (startDate==null?"":(startDate+MessageUtils.message("leave.to")+endDate)) + timeType.getCustomDegreeName() + MessageUtils.message("fileName.degreeCost")+System.currentTimeMillis();
|
|
|
return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,dingding,fileName , allList, path);
|
|
|
} catch (NullPointerException e) {
|
|
|
e.printStackTrace();
|