Min 1 年之前
父节点
当前提交
9da0a302e5

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -728,7 +728,7 @@ public class ProjectController {
         heads.add(MessageUtils.message("entry.Participants"));
         //heads.add("项目经理");
         heads.add(MessageUtils.message("entry.projectManager"));
-        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4){
+        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
             heads.add("日报审核人");
         }
         if(timeType.getReportAuditType()==6){

+ 3 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -3808,7 +3808,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     XSSFCell reportAuditorsCell=null;
                     XSSFCell reportCcCell=null;
                     int i=0;
-                    if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4){
+                    if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
                         i++;
                         reportAuditorsCell = row.getCell(6+i);
                     }
@@ -4469,7 +4469,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         nameCell = row.getCell(3+i);
                         participatorCell = row.getCell(4+i);
                         inchargerCell = row.getCell(5+i);
-                        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4){
+                        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
                             i++;
                             reportAuditorsCell=row.getCell(5+i);
                         }
@@ -4536,7 +4536,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         subNameCell = row.getCell(4+i);
                         participatorCell = row.getCell(5+i);
                         inchargerCell = row.getCell(6+i);
-                        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4){
+                        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
                             i++;
                             reportAuditorsCell=row.getCell(6+i);
                         }

二进制
fhKeeper/formulahousekeeper/management-platform/src/main/resources/upload/项目导入模板.xlsx