Merge remote-tracking branch 'origin/demo_' into demo_

# Conflicts:
#	platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -1441,7 +1441,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         }
 
         // 选择非计划性的订单
-        // repairApplicationFormDTO.setCategory(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
+        repairApplicationFormDTO.setCategory(RepairApplicationFormCategoryEnum.PLAN_NOT.getValue());
         repairApplicationFormDTO.setSearchStartTime(searchStartTime);
         repairApplicationFormDTO.setSearchEndTime(searchEndTime);
         List<RepairApplicationFormVO> list = mapper.selectPageList(repairApplicationFormDTO);
@@ -1454,15 +1454,15 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             vo.setYear(map.get("searchStartTimeMonth").getYear());
             vo.setMonth(map.get("searchStartTimeMonth").getMonthValue());
             for (RepairApplicationFormVO repairApplicationForm : list) {
-                /*if (repairApplicationForm.getDealMinutes() == null) {
-                    continue;
-                }
+//                if (repairApplicationForm.getDealMinutes() == null) {
+//                    continue;
+//                }
                 if (type == 1) {
                     double minutes = repairApplicationForm.getDealMinutes();
                     if (minutes < 24.0) {
                         continue;
                     }
-                }*/
+                }
                 if (repairApplicationForm.getApplyTime().isAfter(map.get("searchStartTimeMonth")) && repairApplicationForm.getApplyTime().isBefore(map.get("searchEndTimeMonth"))) {
                     i++;
                     detailList.add(repairApplicationForm);

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

@@ -2694,7 +2694,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             vo.setTotalNum(Integer.valueOf(String.valueOf(map.get("num"))));
             totalNum = totalNum + vo.getTotalNum();
             for (SbType sbType : typeList) {
-                if (map.get("typeId").equals(sbType.getId())) {
+                if (map.get("typeId")!=null && map.get("typeId").equals(sbType.getId())) {
                     vo.setTypeName(sbType.getName());
                     break;
                 }