2019-09-17 15:37

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -19,6 +19,7 @@ public class SettementUtil {
     public static final String BDZ_TBRNAME="投标人采购设备费";
     public static final String BDZ_ZBRNAME="招标人采购材料费";
     public static final String BDZ_TBNAME="投标报价";
+    public static final String SJ = "税";
 
     /*
         分布分项比对
@@ -141,7 +142,7 @@ public class SettementUtil {
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
-            if(key.contains(BashInfo.JS_SJ)){
+            if(key.contains(SJ)){
                 key=BashInfo.JS_SJ;
             }
             if(key.equals(BDZ_TBRNAME)){
@@ -320,7 +321,7 @@ public class SettementUtil {
 //                    if (money==doubles[0]){
 //                        settlement.setStatus("0");
 //                    }
-                    if (doubles[0]<=moneyComparison1&&doubles[1]>=moneyComparison2){
+                    if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles[0])+','+nf.format(doubles[1])+','+nf.format(doubles[2])+','+nf.format(doubles[3])
@@ -417,15 +418,18 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
                     break;
                 case BashInfo.JS_CSXM:
-                    if (money==wordtotal){
+//                    if (money==wordtotal){
+//                        settlement.setStatus("0");
+//                    }
+                    if (wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(wordtotal1)+","+nf.format(wordtotal2)+","+nf.format(wordtotal)));
                     break;
                 case BashInfo.JS_QTXM:
-                    if(money==otherTotal){
-                        settlement.setStatus("0");
-                    }
+//                    if(money==otherTotal){
+//                        settlement.setStatus("0");
+//                    }
                     if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -507,6 +511,9 @@ public class SettementUtil {
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
             //读取字段区分
+//            if(name.contains(SJ)){
+//                name=BashInfo.JS_SJ;
+//            }
             if(name.equals(BDZ_TBRNAME)){
                 name=BashInfo.JS_CBRF;
             }