Merge remote-tracking branch 'origin/master'

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

@@ -20,6 +20,7 @@ public class SettementUtil {
     public static final String BDZ_ZBRNAME="招标人采购材料费";
     public static final String BDZ_TBNAME="投标报价";
     public static final String SE= "税额";
+    public static final String RESON_KYJ="扣夜间施工增加费";
     /*
         分布分项比对
      */
@@ -203,6 +204,9 @@ public class SettementUtil {
                     }
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
+                case RESON_KYJ:
+                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    break;
                 case BashInfo.JS_JGJS:
                     if (flag){
                         key=BDZ_TBNAME;
@@ -302,6 +306,9 @@ public class SettementUtil {
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisiontotal[1])));
                     break;
+                case RESON_KYJ:
+                    settlement.setStatus("2");
+                    break;
                 case BashInfo.JS_JGJS:
                     double[] doubles = getJgjsComparison(settlements,opinion);
                     if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
@@ -418,6 +425,9 @@ public class SettementUtil {
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisionFbr)+","+nf.format(divisiontotal[1])+","+nf.format(divisiontotal[3])));
                     break;
+                case RESON_KYJ:
+                    settlement.setStatus("2");
+                    break;
                 case BashInfo.JS_JGJS:
                     double[] doubles = getJgjsComparison(settlements,opinion);
                     if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
@@ -460,6 +470,7 @@ public class SettementUtil {
         double[] doubles = new double[8];
         String name;
         double money=0;
+        double kyj = 0.0;
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
             if(name.equals(BDZ_TBRNAME)){
@@ -493,12 +504,16 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_FBRF:
                     doubles[7]=money;
+                    break;
+                case RESON_KYJ:
+                    kyj = money;
+                    break;
             }
         }
         if (opinion){
-            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7];
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7]-kyj;
         }else {
-            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6];
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-kyj;
         }
         return doubles;
     }