月报末班修改，导出判空

src/main/java/com/sa/zentao/service/impl/IZtCountService.java

@@ -2179,9 +2179,9 @@ public class IZtCountService {
         Map<String, String> dataMap = new HashMap<>();
         dataMap.put("name", name);
         dataMap.put("date", DateUtils.formatDate(d, "yyyy-MM"));
-        dataMap.put("准时率得分", performanceDTO.getPunctualityScore().toString());
-        dataMap.put("Bug密度", performanceDTO.getBugScore().toString());
-        dataMap.put("工作量饱和度", performanceDTO.getSaturationScore().toString());
+        dataMap.put("准时率得分", performanceDTO.getPunctualityScore() ==null?"0":performanceDTO.getPunctualityScore().toString());
+        dataMap.put("Bug密度", performanceDTO.getBugScore()==null?"0": performanceDTO.getBugScore().toString());
+        dataMap.put("工作量饱和度", performanceDTO.getSaturationScore()==null?"0": performanceDTO.getSaturationScore().toString());
 
         dataMap.put("代码质量", performanceDTO.getCodeQualityScore()==null?"0":performanceDTO.getCodeQualityScore().toString());
 
@@ -2224,7 +2224,6 @@ public class IZtCountService {
         Map<String, String> dataMap = new HashMap<>();
         dataMap.put("name", name);
         dataMap.put("date", DateUtils.formatDate(d, "yyyy-MM"));
-        dataMap.put("总分", "100");
 
         dataMap.put("及时完成率得分", performanceDTO.getPunctualityScore()==null?"0":performanceDTO.getPunctualityScore().toString());
         dataMap.put("设计质量", performanceDTO.getDesignScore()==null?"0":performanceDTO.getDesignScore().toString());
@@ -2256,8 +2255,8 @@ public class IZtCountService {
         dataMap.put("项目文档", performanceDTO.getDocumentQualityScore()==null?"0":performanceDTO.getDocumentQualityScore().toString());
         dataMap.put("会议管理", performanceDTO.getMeetScore()==null?"0": performanceDTO.getMeetScore() + "");
         dataMap.put("问题管理", performanceDTO.getDevelopFeedbackStory()==null?"0":performanceDTO.getDevelopFeedbackStory().toString());
-        dataMap.put("系统稳定性", "10");
-        dataMap.put("专业技能提升", "5");
+        dataMap.put("系统稳定性", performanceDTO.getSystemStabilityScore()==null?"0": performanceDTO.getSystemStabilityScore().toString());
+        dataMap.put("专业技能提升", performanceDTO.getProfessionalSkillEnhancementScore()==null?"0":performanceDTO.getProfessionalSkillEnhancementScore().toString());
 
 
         dataMap.put("普通bug",performanceDTO.getSlightBug()==null?"0":performanceDTO.getSlightBug().toString());
@@ -2273,9 +2272,9 @@ public class IZtCountService {
 
         dataMap.put("总分", devlopTotal(
                 dataMap.get("版本计划完成率"),
-                dataMap.get("任务管理"),
                 dataMap.get("bug"),
                 dataMap.get("项目文档"),
+                dataMap.get("任务管理"),
                 dataMap.get("会议管理"),
                 dataMap.get("问题管理"),
                 dataMap.get("系统稳定性"),
@@ -2538,9 +2537,9 @@ public class IZtCountService {
         Map<String, String> dataMap = new HashMap<>();
         dataMap.put("name", name);
         dataMap.put("date", DateUtils.formatDate(d, "yyyy-MM"));
-        dataMap.put("项目绩效", performanceDTO.getReleaseScore().toString());
-        dataMap.put("项目文档", performanceDTO.getProjectDocumentScore().toString());
-        dataMap.put("会议管理", performanceDTO.getMeetScore().toString());
+        dataMap.put("项目绩效", performanceDTO.getReleaseScore()==null?"0":performanceDTO.getReleaseScore().toString());
+        dataMap.put("项目文档", performanceDTO.getProjectDocumentScore()==null?"0": performanceDTO.getProjectDocumentScore().toString());
+        dataMap.put("会议管理", performanceDTO.getMeetScore()==null?"0": performanceDTO.getMeetScore().toString());
 
 
         dataMap.put("上线需求数量", performanceDTO.getReleaseCount()==null?"0": performanceDTO.getReleaseCount().toString());
@@ -2575,7 +2574,7 @@ public class IZtCountService {
         dataMap.put("name", name);
         dataMap.put("date", DateUtils.formatDate(d, "yyyy-MM"));
         dataMap.put("准时率得分", performanceDTO.getPunctualityScore()==null?"0": performanceDTO.getPunctualityScore().toString());
-        dataMap.put("缺陷检出率", performanceDTO.getBugFindScore().toString());
+        dataMap.put("缺陷检出率", performanceDTO.getBugFindScore() ==null?"0":performanceDTO.getBugFindScore().toString());
         dataMap.put("测试文档", performanceDTO.getDocumentQualityScore()==null?"0":performanceDTO.getDocumentQualityScore().toString());
 
         dataMap.put("工作态度", performanceDTO.getWorkAttitude()==null?"0":performanceDTO.getWorkAttitude().toString());
@@ -2599,7 +2598,8 @@ public class IZtCountService {
 
         dataMap.put("总分", devlopTotal(dataMap.get("准时率得分")
                 , dataMap.get("缺陷检出率"),
-                dataMap.get("测试文档"), dataMap.get("工作态度"), dataMap.get("质量贡献"), dataMap.get("线上Bug"), dataMap.get("创新贡献"))
+                dataMap.get("测试文档"), dataMap.get("工作态度"),
+                dataMap.get("质量贡献"), dataMap.get("线上Bug"), dataMap.get("创新贡献"))
         );
 
         writeXlsx(name, "templates/scope/测试工程师.xlsx", name + "测试.xlsx", dataMap);