|
@@ -4410,7 +4410,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
row.createCell(index).setCellValue("导入待审核");
|
|
|
} else {
|
|
|
//部门审核
|
|
|
- if(String.valueOf(map.get("is_dept_audit")).equals("1")){
|
|
|
+ if(String.valueOf(map.get("isDeptAudit")).equals("1")){
|
|
|
String deptAuditorId = map.get("deptAuditorName")+"";
|
|
|
String departmentName = map.get("departmentName") + "";
|
|
|
for (User item : users) {
|
|
@@ -4418,9 +4418,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
String deptAuditorName ="$userName="+ item.getCorpwxRealUserid() +"$";
|
|
|
departmentName = "$departmentName=" + departmentName + "$";
|
|
|
- row.createCell(index).setCellValue("待" + departmentName + "(" + deptAuditorName + ")审核");
|
|
|
+ if(timeType.getReportAuditType()==4){
|
|
|
+ row.createCell(index).setCellValue("待项目所属BU[" + departmentName + "](" + deptAuditorName + ")审核");
|
|
|
+ }else {
|
|
|
+ row.createCell(index).setCellValue("待" + departmentName + "(" + deptAuditorName + ")审核");
|
|
|
+ }
|
|
|
}else {
|
|
|
- row.createCell(index).setCellValue("待" + departmentName + "(" + item.getName() + ")审核");
|
|
|
+ if(timeType.getReportAuditType()==4){
|
|
|
+ row.createCell(index).setCellValue("待项目所属BU[" + departmentName + "](" + item.getName() + ")审核");
|
|
|
+ }else {
|
|
|
+ row.createCell(index).setCellValue("待" + departmentName + "(" + item.getName() + ")审核");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
break;
|
|
|
}
|