加班导出

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

@@ -1892,7 +1892,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             headList.add("姓名");
             headList.add("部门");
             headList.add("工作日期");
-            headList.add("部门");
+            headList.add("工作时长(h)");
             headList.add("加班工时(h)");
             if (hasViewSalary) {
                 headList.add("加班成本(元)");
@@ -1901,13 +1901,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<List<String>> allList = new ArrayList<List<String>>();
             allList.add(headList);
             double totalCostTime = 0;
+            double totalWorkTime = 0;
             int seq = 1;
             for (Map<String, Object> map : list) {
                 totalMoneyCost = totalMoneyCost.add((BigDecimal)map.get("cost"));
                 totalCostTime += (Double)map.get("overtimeHours");
+                totalWorkTime += (Double)map.get("workingTime");
                 List<String> rowData = new ArrayList<String>();
                 rowData.add(""+seq);
+                rowData.add((String)map.get("projectCode"));
+                rowData.add((String)map.get("projectName"));
+                rowData.add((String)map.get("degreeName"));
                 rowData.add((String)map.get("username"));
+                rowData.add((String)map.get("departmentName"));
+                rowData.add((String)map.get("createDate"));
+                rowData.add(((Double)map.get("workingTime")).toString());
                 rowData.add(((Double)map.get("overtimeHours")).toString());
                 if (hasViewSalary) {
                     rowData.add(((BigDecimal)map.get("cost")).toString());
@@ -1919,6 +1927,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             //合计
             List<String> sumRow = new ArrayList<String>();
             sumRow.add("合计");
+            sumRow.add("");
+            sumRow.add("");
+            sumRow.add("");
+            sumRow.add("");
+            sumRow.add("");
+            sumRow.add("");
+            sumRow.add(""+totalWorkTime);
             sumRow.add(""+totalCostTime);
             if (hasViewSalary) {
                 sumRow.add(totalMoneyCost.toString());