基于主项目的日报导出修改

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

@@ -2905,12 +2905,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                 }
             }
+            if(company.getPackageCustomer()==1){
+                rowData.add(projectVO.getCustomerName());
+            }
             if (company.getPackageProject() == 1) {
                 Integer level = projectVO.getLevel();
                 if (level == null) {
                     level = 1;
                 }
-                rowData.add(projectVO.getCustomerName());
                 rowData.add(levelArray[level-1]);
                 rowData.add(df.format((Double)projectVO.getContractAmount()));
             }

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

@@ -2797,10 +2797,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             HSSFSheet sheet = workbook.createSheet("工作日报");
             sheet.createFreezePane(0,1);
             List<String> titles = new ArrayList<String>();
-            titles.addAll(Arrays.asList(new String[]{
-                    "序号","员工","所在部门","项目名称","项目分类","子项目名称"
-            }));
-
+            titles.add("序号");
+            titles.add("员工");
+            titles.add("所在部门");
+            titles.add("项目名称");
+            titles.add("项目分类");
+            if(timeType.getMainProjectState()==1){
+                titles.add("主项目名称");
+            }else {
+                titles.add("子项目名称");
+            }
             //项目管理专业版以上，包括任务
             if (company.getPackageProject() == 1) {
                 titles.add("关联任务");
@@ -2984,7 +2990,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 row.createCell(2).setCellValue((String) map.get("departmentName"));
                 row.createCell(3).setCellValue((String) map.get("project"));
                 row.createCell(4).setCellValue((String) map.get("categoryName"));
-                row.createCell(5).setCellValue((String) map.get("subProjectName"));
+                if(timeType.getMainProjectState()==1){
+                    row.createCell(5).setCellValue((String) map.get("projectMainName"));
+                }else {
+                    row.createCell(5).setCellValue((String) map.get("subProjectName"));
+                }
                 int index = 6;
                 if (company.getPackageProject() == 1) {
                     row.createCell(6).setCellValue((String) map.get("taskName"));

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -59,7 +59,7 @@
         a.end_time as endTime, d.name as subProjectName,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
-        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as projectAuditTime
+        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as projectAuditTime,project_main.name as projectMainName
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
@@ -69,6 +69,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join department on department.department_id = c.department_id
+        left join project_main on b.project_main_id=project_main.id
         WHERE (a.state = 1
         <if test="stateKey!=null and stateKey==1">
             or a.state =0
@@ -132,7 +133,7 @@
         a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as
         departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as
-        projectAuditTime
+        projectAuditTime,project_main.name as projectMainName
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
@@ -142,6 +143,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join department on department.department_id = c.department_id
+        left join project_main on project_main.id=b.project_main_id
         WHERE
         (a.state = 1
         <if test="stateKey!=null and stateKey==1">
@@ -171,7 +173,7 @@
         a.end_time as endTime, d.name as subProjectName,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState,a.stage, a.pic_str as picStr, multi_worktime as multiWorktime
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
-        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as projectAuditTime
+        ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, department.department_name as departmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as projectAuditTime,project_main.name as projectMainName
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
@@ -181,6 +183,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join department on department.department_id = c.department_id
+        left join project_main on project_main.id=b.project_main_id
         WHERE (a.state = 1
         <if test="stateKey!=null and stateKey==1">
             or a.state=0