模型计算逻辑调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportIndexResultServiceImpl.java

@@ -65,7 +65,7 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
     @Override
     public void reportIndexResult() {
         try {
-            List<BaseCompany> baseCompanies = baseCompanyService.companyIdByTypeList("1");
+            List<BaseCompany> baseCompanies = baseCompanyService.companyIdByTypeList("4");
             if (CollectionUtils.isNotEmpty(baseCompanies)) {
                 Calendar now = Calendar.getInstance();
                 LocalDate date=LocalDate.now();
@@ -276,19 +276,24 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                                                         reportIndexResult.setScoreType(1);
                                                         if (indexConfig3.get(j).getSeniorIndex().equals(2)) {
                                                             if (indexConfig3.get(j).getIndexCode().equals("10024")) {
-                                                                reportIndexResult.setIndexData(baseBuilds.get(0).getBaseBuild().getFireRating().toString());
-                                                                if (baseBuilds.get(0).getBaseBuild().getFireRating().equals(1)) {
-                                                                    reportIndexResult.setIndexScore(100 * indexConfig3.get(j).getIndexWeight());
-                                                                    reportIndexResult2.setIndexScore(100 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
-                                                                } else if (baseBuilds.get(0).getBaseBuild().getFireRating().equals(2)) {
-                                                                    reportIndexResult.setIndexScore(75 * indexConfig3.get(j).getIndexWeight());
-                                                                    reportIndexResult2.setIndexScore(75 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
-                                                                } else if (baseBuilds.get(0).getBaseBuild().getFireRating().equals(3)) {
+                                                                if (baseBuilds.get(0).getBaseBuild().getFireRating()!=null){
+                                                                    reportIndexResult.setIndexData(baseBuilds.get(0).getBaseBuild().getFireRating().toString());
+                                                                    if (baseBuilds.get(0).getBaseBuild().getFireRating().equals(1)) {
+                                                                        reportIndexResult.setIndexScore(100 * indexConfig3.get(j).getIndexWeight());
+                                                                        reportIndexResult2.setIndexScore(100 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
+                                                                    } else if (baseBuilds.get(0).getBaseBuild().getFireRating().equals(2)) {
+                                                                        reportIndexResult.setIndexScore(75 * indexConfig3.get(j).getIndexWeight());
+                                                                        reportIndexResult2.setIndexScore(75 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
+                                                                    } else if (baseBuilds.get(0).getBaseBuild().getFireRating().equals(3)) {
+                                                                        reportIndexResult.setIndexScore(50 * indexConfig3.get(j).getIndexWeight());
+                                                                        reportIndexResult2.setIndexScore(50 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
+                                                                    } else {
+                                                                        reportIndexResult.setIndexScore(25 * indexConfig3.get(j).getIndexWeight());
+                                                                        reportIndexResult2.setIndexScore(25 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
+                                                                    }
+                                                                }else {
                                                                     reportIndexResult.setIndexScore(50 * indexConfig3.get(j).getIndexWeight());
                                                                     reportIndexResult2.setIndexScore(50 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
-                                                                } else {
-                                                                    reportIndexResult.setIndexScore(25 * indexConfig3.get(j).getIndexWeight());
-                                                                    reportIndexResult2.setIndexScore(25 * indexConfig3.get(j).getIndexWeight() * indexConfig2.get(k).getIndexWeight());
                                                                 }
                                                             }
                                                             this.save(reportIndexResult);