日报审核人，抄送人支持上传项目

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

@@ -738,7 +738,7 @@ public class ProjectController {
         heads.add(MessageUtils.message("entry.level"));
         exampleDataList.add("张三");
         exampleDataList.add("张三");
-        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4){
+        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
             exampleDataList.add("张三");
         }
         if(timeType.getReportAuditType()==6){

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

@@ -3958,20 +3958,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         projectMapper.updateById(project);
                     }else {
                         if(projectMapper.insert(project)>0){
-                            if (!StringUtils.isEmpty(project.getInchargerId())) {
-                                ProjectAuditor projectAuditor=new ProjectAuditor();
-                                projectAuditor.setAuditorId(project.getInchargerId());
-                                projectAuditor.setAuditorName(project.getInchargerName());
-                                projectAuditor.setProjectId(project.getId());
-                                projectAuditorMapper.insert(projectAuditor);
-                                if(timeType.getReportAuditType()==6){
-                                    ProjectCcuser projectCcuser=new ProjectCcuser();
-                                    projectCcuser.setUserId(project.getInchargerId());
-                                    projectCcuser.setUserName(project.getInchargerName());
-                                    projectCcuser.setProjectId(project.getId());
-                                    projectCcuserService.save(projectCcuser);
-                                }
-                            }
+
                         }
                     }
                     importCount++;
@@ -4209,6 +4196,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 }
                             }
                         }
+                    } else {
+                        ProjectAuditor projectAuditor=new ProjectAuditor();
+                        projectAuditor.setAuditorId(project.getInchargerId());
+                        projectAuditor.setAuditorName(project.getInchargerName());
+                        projectAuditor.setProjectId(project.getId());
+                        projectAuditorMapper.insert(projectAuditor);
                     }
                     if (projectAuditorList.size() > 0) {
                         //批量保存
@@ -4932,20 +4925,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         projectMapper.updateById(project);
                     }else {
                         if(projectMapper.insert(project)>0){
-                            if (!StringUtils.isEmpty(project.getInchargerId())) {
-                                ProjectAuditor projectAuditor=new ProjectAuditor();
-                                projectAuditor.setAuditorId(project.getInchargerId());
-                                projectAuditor.setAuditorName(project.getInchargerName());
-                                projectAuditor.setProjectId(project.getId());
-                                projectAuditorMapper.insert(projectAuditor);
-                                if(timeType.getReportAuditType()==6){
-                                    ProjectCcuser projectCcuser=new ProjectCcuser();
-                                    projectCcuser.setUserId(project.getInchargerId());
-                                    projectCcuser.setUserName(project.getInchargerName());
-                                    projectCcuser.setProjectId(project.getId());
-                                    projectCcuserService.save(projectCcuser);
-                                }
-                            }
+
                         }
                     }
                     Integer id = project.getId();
@@ -5452,6 +5432,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 }
                             }
                         }
+                    } else {
+                        //如果没有审核人，则默认为负责人
+                        ProjectAuditor p = new ProjectAuditor();
+                        p.setAuditorId(project.getInchargerId());
+                        p.setAuditorName(project.getInchargerName());
+                        p.setProjectId(project.getId());
+                        projectAuditorList.add(p);
                     }
                     if (projectAuditorList.size() > 0) {
                         //批量保存

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -56,7 +56,7 @@
                                 </el-upload> -->
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectImport">
-                                <el-link type="primary" :underline="false" @click="downloadmb" v-if="user.company.packageCustomer == 1 || user.company.packageProvider == 1 || user.timeType.mainProjectState == 1 || user.companyId == '936'">{{ $t('Downloadthetemplate') }}</el-link>
+                                <el-link type="primary" :underline="false" @click="downloadmb" v-if="user.company.packageCustomer == 1 || user.company.packageProvider == 1 || user.timeType.mainProjectState == 1 || user.companyId == '936' || user.timeType.reportCc == 1">{{ $t('Downloadthetemplate') }}</el-link>
                                 <el-link type="primary" :underline="false" href="./upload/项目导入模板.xlsx" :download="$t('importtemplateproject') + '.xlsx'" v-else>{{ $t('Downloadthetemplate') }}</el-link>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectExport" :disabled="exportDisabled">