|
|
@@ -6573,6 +6573,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
titles.add(MessageUtils.message("excel.auditTime"));
|
|
|
titles.add(MessageUtils.message("excel.auditProcess"));
|
|
|
}else {
|
|
|
+ titles.add(MessageUtils.message("excel.proReviewer"));
|
|
|
titles.add("项目经理");
|
|
|
}
|
|
|
|
|
|
@@ -6976,15 +6977,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
if (timeType.getShowFillauditTime() == 1) {
|
|
|
if (exportType==0){
|
|
|
item.add(sdf.format((Date)map.get("time")));
|
|
|
- if(needCorpWxTranslate){
|
|
|
- String projectAuditorName ="$userName="+String.valueOf(map.get("projectAuditorCorpwxUserId"))+"$";
|
|
|
- item.add(projectAuditorName);
|
|
|
- }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
|
|
|
- String projectAuditorName ="$userName="+(String)map.get("projectAuditorName")+"$";
|
|
|
- item.add(projectAuditorName);
|
|
|
- }else {
|
|
|
- item.add((String)map.get("projectAuditorName"));
|
|
|
- }
|
|
|
+ }
|
|
|
+ //固定显示审核人
|
|
|
+ if(needCorpWxTranslate){
|
|
|
+ String projectAuditorName ="$userName="+String.valueOf(map.get("projectAuditorCorpwxUserId"))+"$";
|
|
|
+ item.add(projectAuditorName);
|
|
|
+ }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
|
|
|
+ String projectAuditorName ="$userName="+(String)map.get("projectAuditorName")+"$";
|
|
|
+ item.add(projectAuditorName);
|
|
|
+ }else {
|
|
|
+ item.add((String)map.get("projectAuditorName"));
|
|
|
}
|
|
|
if(needCorpWxTranslate){
|
|
|
String projectManagerName ="$userName="+String.valueOf(map.get("projectManagerCorpwxUserId"))+"$";
|