Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmCustomInfoServiceImpl.java

@@ -105,10 +105,24 @@ public class CrmCustomInfoServiceImpl extends AbstractCrudService<CrmCustomInfoM
         if(maps.size() > 0){
             for (int i = 0; i < maps.size(); i++) {
                 CrmCustomInfoStatisticVO statisticVO = new CrmCustomInfoStatisticVO();
-                statisticVO.setMaintainAmount(Double.parseDouble(maps.get(i).get("maintainAmount").toString()));
+                if(Objects.nonNull(maps.get(i).get("maintainAmount"))){
+                    statisticVO.setMaintainAmount(Double.parseDouble(maps.get(i).get("maintainAmount").toString()));
+                }else{
+                    statisticVO.setMaintainAmount(Double.parseDouble("0"));
+                }
+
                 statisticVO.setMaintainNum(Integer.parseInt(maps.get(i).get("maintainNum").toString()));
-                statisticVO.setMaintainUsingNum(Integer.parseInt(maps.get(i).get("maintainUsingNum").toString()));
-                statisticVO.setMaintainExpireNum(Integer.parseInt(maps.get(i).get("maintainExpireNum").toString()));
+
+                if(Objects.nonNull(maps.get(i).get("maintainUsingNum"))){
+                    statisticVO.setMaintainUsingNum(Integer.parseInt(maps.get(i).get("maintainUsingNum").toString()));
+                }else{
+                    statisticVO.setMaintainUsingNum(0);
+                }
+                if(Objects.nonNull(maps.get(i).get("maintainExpireNum"))){
+                    statisticVO.setMaintainExpireNum(Integer.parseInt(maps.get(i).get("maintainExpireNum").toString()));
+                }else{
+                    statisticVO.setMaintainExpireNum(0);
+                }
                 list.add(statisticVO);
             }
         }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java

@@ -133,9 +133,23 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
             for (int i = 0; i < maps.size(); i++) {
                 CrmDeviceRepairStatisticVO statisticVO = new CrmDeviceRepairStatisticVO();
                 statisticVO.setRepairNum(Integer.parseInt(maps.get(i).get("repairNum").toString()));
-                statisticVO.setAverageScore(Double.parseDouble(maps.get(i).get("averageScore").toString()));
-                statisticVO.setProcessingNum(Integer.parseInt(maps.get(i).get("processingNum").toString()));
-                statisticVO.setProcessedNum(Integer.parseInt(maps.get(i).get("processedNum").toString()));
+
+                if(Objects.nonNull(maps.get(i).get("averageScore"))){
+                    statisticVO.setAverageScore(Double.parseDouble(maps.get(i).get("averageScore").toString()));
+                }else{
+                    statisticVO.setAverageScore(Double.parseDouble("0"));
+                }
+                if(Objects.nonNull(maps.get(i).get("processingNum"))){
+                    statisticVO.setProcessingNum(Integer.parseInt(maps.get(i).get("processingNum").toString()));
+                }else{
+                    statisticVO.setProcessingNum(0);
+                }
+                if(Objects.nonNull(maps.get(i).get("processedNum"))){
+                    statisticVO.setProcessedNum(Integer.parseInt(maps.get(i).get("processedNum").toString()));
+                }else{
+                    statisticVO.setProcessedNum(0);
+                }
+
                 list.add(statisticVO);
             }
         }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmInvoiceInfoServiceImpl.java

@@ -28,6 +28,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -75,9 +76,23 @@ public class CrmInvoiceInfoServiceImpl extends AbstractCrudService<CrmInvoiceInf
             for (int i = 0; i < maps.size(); i++) {
                 CrmInvoiceInfoStatisticVO statisticVO = new CrmInvoiceInfoStatisticVO();
                 statisticVO.setInvoiceApplicantNum(Integer.parseInt(maps.get(i).get("invoiceApplicantNum").toString()));
-                statisticVO.setNotInvoicedAmount(Double.parseDouble(maps.get(i).get("notInvoicedAmount").toString()));
-                statisticVO.setNotInvoicedNum(Integer.parseInt(maps.get(i).get("notInvoicedNum").toString()));
-                statisticVO.setInvoicedNum(Integer.parseInt(maps.get(i).get("invoicedNum").toString()));
+
+                if(Objects.nonNull(maps.get(i).get("notInvoicedAmount"))){
+                    statisticVO.setNotInvoicedAmount(Double.parseDouble(maps.get(i).get("notInvoicedAmount").toString()));
+                }else{
+                    statisticVO.setNotInvoicedAmount(Double.parseDouble("0"));
+                }
+                if(Objects.nonNull(maps.get(i).get("notInvoicedNum"))){
+                    statisticVO.setNotInvoicedNum(Integer.parseInt(maps.get(i).get("notInvoicedNum").toString()));
+                }else{
+                    statisticVO.setNotInvoicedNum(0);
+                }
+                if(Objects.nonNull(maps.get(i).get("invoicedNum"))){
+                    statisticVO.setInvoicedNum(Integer.parseInt(maps.get(i).get("invoicedNum").toString()));
+                }else{
+                    statisticVO.setInvoicedNum(0);
+                }
+
                 list.add(statisticVO);
             }
         }