tijiao

src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -324,7 +324,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 int Time1 = dateTime3.intValue() - resultPauseTime.intValue();
                 Map<String, Object> requirementInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId);
                 String capacityTypeName =(String) requirementInfo.get("capacityTypeName");
-                if (capacityTypeName.contains("吊车")) {
+                if (capacityTypeName != null && capacityTypeName.contains("吊车")) {
                     //100吨以下
                     int hours=Time1/60;
                     BigDecimal minutes=new BigDecimal(Time1%60);
@@ -376,10 +376,10 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 //如果车辆类型为100 吨以下吨位吊车作业时间以2小时为起点计算，超过2小时以实际作业时间计算
                 Map<String, Object> requirementInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId);
                 String capacityTypeName =(String) requirementInfo.get("capacityTypeName");
-                if (capacityTypeName.contains("吊车")) {
+                if (capacityTypeName != null && capacityTypeName.contains("吊车")) {
                     //100吨以下
-                    BigDecimal hours=new BigDecimal(dateTime1 / (1000*60*60));
-                    BigDecimal minutes=new BigDecimal(dateTime3.intValue()%60);
+                    BigDecimal hours =new BigDecimal(dateTime1 / (1000*60*60));
+                    BigDecimal minutes =new BigDecimal(dateTime3.intValue()%60);
                     int hour = Integer.parseInt(String.valueOf(hours));
                     if (TwoHour.contains(capacityTypeName)) {
                         //判断是否小于2个小时