2 Commits 6d81a1f896 ... edfd6b9fe7

Auteur SHA1 Bericht Datum
  QuYueTing edfd6b9fe7 Merge branch 'master' of http://47.100.37.243:10191/quyueting/manHourHousekeeper 1 maand geleden
  QuYueTing 5c288f8c69 导出日报简单模式也增加日报审核人 1 maand geleden

+ 11 - 9
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -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"))+"$";