Преглед на файлове

修复设备工作台bug

408249787 преди 3 години
родител
ревизия
3b7dadb47a

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -29,6 +29,7 @@ public class RepairApplicationForm implements Serializable {
      */
     @Id
     private String id;
+    @Transient
     private String model;
 
     /**

+ 5 - 7
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -634,16 +634,14 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         if (CollectionUtil.isNotEmpty(repairList)) {
             totalRepairNumber = repairList.size();
             for (RepairApplicationForm repairApplicationForm : repairList) {
-                if (repairApplicationForm.getCategory().equals(RepairApplicationFormCategoryEnum.PLAN.getValue())) {
+                if (repairApplicationForm.getCategory() == null) {
+                    noIdeaNumber++;
+                } else if (repairApplicationForm.getCategory().equals(RepairApplicationFormCategoryEnum.PLAN.getValue())) {
                     planNumber++;
-                }
-                if (repairApplicationForm.getCategory().equals(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue())) {
+                } else if (repairApplicationForm.getCategory().equals(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue())) {
                     notPlanNumber++;
-                }
-                if (repairApplicationForm.getCategory().equals(RepairApplicationFormCategoryEnum.OTHER.getValue())) {
+                } else if (repairApplicationForm.getCategory().equals(RepairApplicationFormCategoryEnum.OTHER.getValue())) {
                     otherNumber++;
-                } else {
-                    noIdeaNumber++;
                 }
             }
         }