liyg 2 yıl önce
ebeveyn
işleme
b3e5be985b

+ 9 - 6
src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -18,10 +18,8 @@ import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * TmstruckTimeTskResult服务实现:
@@ -60,6 +58,11 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车,50吨吊车";
 
     private static final String FourHour="220吨吊车,130吨吊车,120吨吊车,150吨吊车,100吨吊车";
+    private static final Set<String> FourHourSet;
+    static {
+        String arr[]={"220吨吊车","130吨吊车","120吨吊车","150吨吊车","100吨吊车"};
+        FourHourSet=Arrays.stream(arr).collect(Collectors.toSet());
+    }
 
     private static final String DxTemp="达兴能源二厂,化工厂";
 
@@ -349,7 +352,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 }
                 //特殊情况,根据不同计时规则重新计算
                 //4小时规则:100吨以上吊车
-                if (FourHour.contains(capacityTypeName)){
+                if (FourHourSet.contains(capacityTypeName)){
                     if (hour<4&&hour>=0){
                         //1、如实际使用时间不足4小时按照(使用时间+4小时)进行最终结算
                         tmstruckTimeTaskResult.setResultAboutTime(4+hour+"小时"+minutes+"分钟");
@@ -568,7 +571,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                         tmstruckTimeTaskResult1.setResultAboutTime(hour+"小时"+minutes+"分钟");
                     }
                     //如果为100吨以上吊车
-                }else if (FourHour.contains(capacityTypeName)){
+                }else if (FourHourSet.contains(capacityTypeName)){
                     //1、如实际使用时间不足4小时按照(使用时间+4小时)进行最终结算
                     if (hour<0) {
                         tmstruckTimeTaskResult1.setResultAboutTime("4小时");