xusl 1 anno fa
parent
commit
9a1f1d39ea

+ 1 - 18
ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/DashboardService.java

@@ -899,24 +899,7 @@ public class DashboardService extends BaseService {
 
 
   public BigDecimal getRate(BigDecimal normalB, BigDecimal shouldB, String uploadFileType){
-    BigDecimal rateB;
-    List<FileTypeEnum> hlj = FileTypeEnum.getHLJ();
-    boolean tab = false;
-    for (FileTypeEnum fileTypeEnum : hlj) {
-      if(fileTypeEnum.name().equals(uploadFileType)){
-        tab = true;
-        break;
-      }
-    }
-    if (tab){
-      normalB = normalB.add(new BigDecimal(1));
-      rateB = normalB.divide(shouldB, 2, BigDecimal.ROUND_UP);
-      if(rateB.compareTo(new BigDecimal(1))>0){
-        rateB = new BigDecimal(1);
-      }
-    }else {
-      rateB = normalB.divide(shouldB, 2, BigDecimal.ROUND_UP);
-    }
+    BigDecimal rateB = normalB.divide(shouldB, 2, BigDecimal.ROUND_UP);
     String demo = super.getSysParameter("demo", "1");
     if ("1".equals(demo)) {
       rateB = new BigDecimal("1");