Merge remote-tracking branch 'origin/master'

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

@@ -21,6 +21,7 @@ public class SettementUtil {
     public static final String BDZ_TBNAME="投标报价";
     public static final String SE= "税额";
     public static final String RESON_KYJ="扣夜间施工增加费";
+    public static final String RESON_QZWT="签证及委托";
     /*
         分布分项比对
      */
@@ -121,7 +122,7 @@ public class SettementUtil {
     public static final  String[] TOP2 = {BDZ_TBBJ,RESON_JGJS1,BDZ_TBBJ1,RESON_JGJS3, RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,BDZ_TBBJ2,RESON_JGJS8};
     //工程竣工 拼接数组
     public static final String[] TOP1 = {RESON_JGJS,RESON_JGJS1,RESON_JGJS2,RESON_JGJS3,RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,RESON_JGJS7,RESON_JGJS8};
-    public static final String[] DLBDZ_FBFX2 = {BDZ_FXFX,BDZ_FBFX1,BDZ_FBFX2,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
+    public static final String[] DLBDZ_FBFX2 = {RESON_FBFX1,BDZ_FBFX1,BDZ_FBFX2,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
     public static final String[] DLBDZ_FBFX1 = {RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_GCJS4,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
     /*
         设置转换参数
@@ -140,10 +141,15 @@ public class SettementUtil {
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();
         String key = "";//获取结算名称
+        String key1 = "";
         Integer count = 0; //计数器
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
+            if(key.contains(RESON_KYJ)){
+                key1 = key;
+                key = RESON_KYJ;
+            }
             if (key.contains(BashInfo.JS_SJ)){
                 key=BashInfo.JS_SJ;
             }
@@ -207,6 +213,9 @@ public class SettementUtil {
                 case RESON_KYJ:
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
+                case RESON_QZWT:
+                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    break;
                 case BashInfo.JS_JGJS:
                     if (flag){
                         key=BDZ_TBNAME;
@@ -309,6 +318,9 @@ public class SettementUtil {
                 case RESON_KYJ:
                     settlement.setStatus("2");
                     break;
+                case RESON_QZWT:
+                    settlement.setStatus("2");
+                    break;
                 case BashInfo.JS_JGJS:
                     double[] doubles = getJgjsComparison(settlements,opinion);
                     if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
@@ -428,6 +440,9 @@ public class SettementUtil {
                 case RESON_KYJ:
                     settlement.setStatus("2");
                     break;
+                case RESON_QZWT:
+                    settlement.setStatus("2");
+                    break;
                 case BashInfo.JS_JGJS:
                     double[] doubles = getJgjsComparison(settlements,opinion);
                     if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
@@ -471,6 +486,7 @@ public class SettementUtil {
         String name;
         double money=0;
         double minus = 0.0;
+        double addcount = 0.0;
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
             if(name.equals(BDZ_TBRNAME)){
@@ -508,12 +524,15 @@ public class SettementUtil {
                 case RESON_KYJ:
                     minus = money;
                     break;
+                case RESON_QZWT:
+                    addcount=money;
+                    break;
             }
         }
         if (opinion){
-            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7]-minus;
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7]-minus+addcount;
         }else {
-            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-minus;
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-minus+addcount;
         }
         return doubles;
     }