定时任务质量稽核

server/src/main/java/edp/davinci/controller/QualityTaskController.java

@@ -392,34 +392,54 @@ public class QualityTaskController extends BaseController {
             DecimalFormat df = new DecimalFormat("0.00");//格式化小数
 
             if (null != qualityAuditor.getIntegrityCorrect() && null != qualityAuditor.getIntegrityError()) {
-                // 完整性
-                String integrityCorrectProbability = df.format((float) qualityAuditor.getIntegrityCorrect() / (qualityAuditor.getIntegrityCorrect() + qualityAuditor.getIntegrityError()));//返回的是String类型
-                qualityAuditorDto.setIntegrityCorrectProbability(integrityCorrectProbability);
-                String integrityErrorProbability = df.format((float) qualityAuditor.getIntegrityError() / (qualityAuditor.getIntegrityCorrect() + qualityAuditor.getIntegrityError()));//返回的是String类型
-                qualityAuditorDto.setIntegrityErrorProbability(integrityErrorProbability);
+                if ((qualityAuditor.getIntegrityCorrect() + qualityAuditor.getIntegrityCorrect()) == 0) {
+                    qualityAuditorDto.setIntegrityCorrectProbability("0%");
+                    qualityAuditorDto.setIntegrityErrorProbability("0%");
+                } else {
+                    // 完整性
+                    String integrityCorrectProbability = df.format((float) qualityAuditor.getIntegrityCorrect() / (qualityAuditor.getIntegrityCorrect() + qualityAuditor.getIntegrityError()));//返回的是String类型
+                    qualityAuditorDto.setIntegrityCorrectProbability(integrityCorrectProbability);
+                    String integrityErrorProbability = df.format((float) qualityAuditor.getIntegrityError() / (qualityAuditor.getIntegrityCorrect() + qualityAuditor.getIntegrityError()));//返回的是String类型
+                    qualityAuditorDto.setIntegrityErrorProbability(integrityErrorProbability);
+                }
             }
 
             if (null != qualityAuditor.getUniformityCorrect() && null != qualityAuditor.getUniformityError()) {
-                // 一致性
-                String uniformityCorrectProbability = df.format((float) qualityAuditor.getUniformityCorrect() / (qualityAuditor.getUniformityCorrect() + qualityAuditor.getUniformityError()));//返回的是String类型
-                qualityAuditorDto.setUniformityCorrectProbability(uniformityCorrectProbability);
-                String uniformityErrorProbability = df.format((float) qualityAuditor.getUniformityError() / (qualityAuditor.getUniformityCorrect() + qualityAuditor.getUniformityError()));//返回的是String类型
-                qualityAuditorDto.setUniformityErrorProbability(uniformityErrorProbability);
+                if ((qualityAuditor.getUniformityCorrect() + qualityAuditor.getUniformityError()) == 0) {
+                    qualityAuditorDto.setUniformityCorrectProbability("0%");
+                    qualityAuditorDto.setUniformityErrorProbability("0%");
+                } else {
+                    // 一致性
+                    String uniformityCorrectProbability = df.format((float) qualityAuditor.getUniformityCorrect() / (qualityAuditor.getUniformityCorrect() + qualityAuditor.getUniformityError()));//返回的是String类型
+                    qualityAuditorDto.setUniformityCorrectProbability(uniformityCorrectProbability);
+                    String uniformityErrorProbability = df.format((float) qualityAuditor.getUniformityError() / (qualityAuditor.getUniformityCorrect() + qualityAuditor.getUniformityError()));//返回的是String类型
+                    qualityAuditorDto.setUniformityErrorProbability(uniformityErrorProbability);
+                }
             }
 
             if (null != qualityAuditor.getNormativeCorrect() && null != qualityAuditor.getNormativeError()) {
-                // 规范性
-                String normativeCorrectProbability = df.format((float) qualityAuditor.getNormativeCorrect() / (qualityAuditor.getNormativeCorrect() + qualityAuditor.getNormativeError()));//返回的是String类型
-                qualityAuditorDto.setNormativeCorrectProbability(normativeCorrectProbability);
-                String normativeErrorProbability = df.format((float) qualityAuditor.getNormativeError() / (qualityAuditor.getNormativeCorrect() + qualityAuditor.getNormativeError()));//返回的是String类型
-                qualityAuditorDto.setNormativeErrorProbability(normativeErrorProbability);
+                if ((qualityAuditor.getNormativeCorrect() + qualityAuditor.getNormativeError()) == 0) {
+                    qualityAuditorDto.setNormativeCorrectProbability("0%");
+                    qualityAuditorDto.setNormativeErrorProbability("0%");
+                } else {
+                    // 规范性
+                    String normativeCorrectProbability = df.format((float) qualityAuditor.getNormativeCorrect() / (qualityAuditor.getNormativeCorrect() + qualityAuditor.getNormativeError()));//返回的是String类型
+                    qualityAuditorDto.setNormativeCorrectProbability(normativeCorrectProbability);
+                    String normativeErrorProbability = df.format((float) qualityAuditor.getNormativeError() / (qualityAuditor.getNormativeCorrect() + qualityAuditor.getNormativeError()));//返回的是String类型
+                    qualityAuditorDto.setNormativeErrorProbability(normativeErrorProbability);
+                }
             }
             if (null != qualityAuditor.getAccuracyCorrect() && null != qualityAuditor.getAccuracyError()) {
-                // 准确性
-                String accuracyCorrectProbability = df.format((float) qualityAuditor.getAccuracyCorrect() / (qualityAuditor.getAccuracyCorrect() + qualityAuditor.getAccuracyError()));//返回的是String类型
-                qualityAuditorDto.setAccuracyCorrectProbability(accuracyCorrectProbability);
-                String accuracyErrorProbability = df.format((float) qualityAuditor.getAccuracyError() / (qualityAuditor.getAccuracyCorrect() + qualityAuditor.getAccuracyError()));//返回的是String类型
-                qualityAuditorDto.setAccuracyErrorProbability(accuracyErrorProbability);
+                if ((qualityAuditor.getAccuracyCorrect() + qualityAuditor.getAccuracyError()) == 0) {
+                    qualityAuditorDto.setAccuracyCorrectProbability("0%");
+                    qualityAuditorDto.setAccuracyErrorProbability("0%");
+                } else {
+                    // 准确性
+                    String accuracyCorrectProbability = df.format((float) qualityAuditor.getAccuracyCorrect() / (qualityAuditor.getAccuracyCorrect() + qualityAuditor.getAccuracyError()));//返回的是String类型
+                    qualityAuditorDto.setAccuracyCorrectProbability(accuracyCorrectProbability);
+                    String accuracyErrorProbability = df.format((float) qualityAuditor.getAccuracyError() / (qualityAuditor.getAccuracyCorrect() + qualityAuditor.getAccuracyError()));//返回的是String类型
+                    qualityAuditorDto.setAccuracyErrorProbability(accuracyErrorProbability);
+                }
             }
 
             qualityAuditorDtoList.add(qualityAuditorDto);