个人日报导出bug修改

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

@@ -2810,7 +2810,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
         List<HashMap> projectList = projectMapper.getBaseCostAndRealCost(companyId, null, null, null);
         List<List<String>> exportList = new ArrayList<>();
-        String[] titles = {"项目编号", "项目名称", "当前总预算", "已发生总工时成本"};
+        String[] titles = {"项目编号", "项目名称", "当前总预算","当前剩余预算","总剩余预算","已发生总工时成本"};
         ArrayList<String> headList = Lists.list(titles);
         //列,根据定义的工时预警类型的成本项来
         List<ProjectBasecostSetting> settingList = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId).eq("alarm_type", 1));
@@ -2843,6 +2843,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                 }
                 item.put("realcostList", proRealCost);
+                BigDecimal baseCost=new BigDecimal(String.valueOf(item.get("baseCost")));
+                baseCost=baseCost.subtract((BigDecimal) item.get("feeMan"));
+                BigDecimal baseCurcost=new BigDecimal(String.valueOf(item.get("baseCurcost")));
+                baseCurcost=baseCurcost.subtract((BigDecimal) item.get("feeMan"));
+                item.put("remainingBudget",baseCost);
+                item.put("currentRemainingBudget",baseCurcost);
             }
         }
         DecimalFormat df = new DecimalFormat("#0.00");
@@ -2852,6 +2858,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             data.add((String)project.get("projectCode"));
             data.add((String)project.get("projectName"));
             data.add(project.get("baseCurcost") != null?project.get("baseCurcost").toString():"");
+            data.add(project.get("currentRemainingBudget") != null?project.get("currentRemainingBudget").toString():"");
+            data.add(project.get("remainingBudget") != null?project.get("remainingBudget").toString():"");
             data.add(""+project.get("feeMan"));
             List<ProjectCurrentcost> curList = (List<ProjectCurrentcost>)project.get("curcostList");
             List<HashMap> realList = (List<HashMap>)project.get("realcostList");

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

@@ -2937,7 +2937,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
                 allReportByDate = dealDataList;
             }
-
+            System.out.println(allReportByDate);
             DecimalFormat df = new DecimalFormat("#0.0");
             for (Map<String, Object> map : allReportByDate) {
                 HSSFRow row = sheet.createRow(rowNum);

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

@@ -157,7 +157,7 @@
             AND a.project_id = #{projectId}
         </if>
         <if test="leaderId != null">
-            AND b.incharger_id = #{leaderId}
+            AND (b.incharger_id = #{leaderId} or a.creator_id=#{leaderId})
         </if>
         <if test="departmentId != null">
             AND department.department_id = #{departmentId}