Merge remote-tracking branch 'origin/master'

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

@@ -32,6 +32,8 @@ public class SettementUtil {
     public static final String RESON_ZGTB="最高投标限价";
     public static final String RESON_FBFXGCF1="建筑工程费";
     public static final String RESON_FBFXGCF2="安装工程费";
+    public static final String RESON_XF="下浮";
+    public static final String RESON_XFHZJ="下浮后造价";
 
     /*
         分布分项比对
@@ -245,6 +247,9 @@ public class SettementUtil {
                 case RESON_ZGTB:
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
+                case RESON_XFHZJ:
+                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    break;
             }
         }
         if (flagTotal){
@@ -303,6 +308,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZGTB)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_XFHZJ)){
+                name = BashInfo.JS_GCJS;
+            }
             money=settlement.getMoney();
             moneyComparison1 = money+5.0;
             moneyComparison2 = money-5.0;
@@ -418,6 +426,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZGTB)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_XFHZJ)){
+                name = BashInfo.JS_GCJS;
+            }
             //获取金额
             money=settlement.getMoney();
             moneyComparison1 = money+5.0;
@@ -517,12 +528,12 @@ public class SettementUtil {
             if (name.equals(BDZ_TBNAME)){
                 name=BashInfo.JS_JGJS;
             }
-            if (name.contains(RESON_KYJ)){
+            if (name.contains(RESON_KYJ)||name.contains(RESON_XF)||name.contains(RESON_KYJ1)){
                 name = RESON_KYJ;
             }
-            if (name.contains(RESON_KYJ1)){
-                name = RESON_KYJ1;
-            }
+//            if (){
+//                name = RESON_KYJ1;
+//            }
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
@@ -532,6 +543,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZGTB)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_XFHZJ)){
+                name = BashInfo.JS_GCJS;
+            }
             switch (name) {
                 case BashInfo.JS_FBFX:
                     doubles[1]=money;
@@ -557,9 +571,9 @@ public class SettementUtil {
                 case RESON_KYJ:
                     minus += money;
                     break;
-                case RESON_KYJ1:
-                    minus += money;
-                    break;
+//                case RESON_KYJ1:
+//                    minus += money;
+//                    break;
                 default:
                     if (name.equals(BashInfo.JS_JGJS)){
                         jgjeCount=money;
@@ -612,12 +626,12 @@ public class SettementUtil {
             if (name.equals(BDZ_TBNAME)){
                 name=BashInfo.JS_JGJS;
             }
-            if (name.contains(RESON_KYJ)){
+            if (name.contains(RESON_KYJ)||name.contains(RESON_XF)||name.contains(RESON_KYJ1)){
                 name = RESON_KYJ;
             }
-            if (name.contains(RESON_KYJ1)){
-                name = RESON_KYJ1;
-            }
+//            if (name.contains(RESON_KYJ1)){
+//                name = RESON_KYJ1;
+//            }
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
@@ -627,6 +641,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZGTB)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_XFHZJ)){
+                name = BashInfo.JS_GCJS;
+            }
             money =settlement.getMoney();
             switch (name) {
                 case BashInfo.JS_FBRF:
@@ -635,9 +652,9 @@ public class SettementUtil {
                 case RESON_KYJ:
                     minus += money;
                     break;
-                case RESON_KYJ1:
-                    minus += money;
-                    break;
+//                case RESON_KYJ1:
+//                    minus += money;
+//                    break;
                 default:
                     if (!name.equals(BashInfo.JS_JGJS)&&!name.equals(BashInfo.JS_GCJS)){
                         addcount+=money;
@@ -741,6 +758,11 @@ public class SettementUtil {
                     reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
+                case RESON_XFHZJ:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    settlement.setReason(reason);
+                    break;
+
             }
         }
         return settlementList;
@@ -834,6 +856,10 @@ public class SettementUtil {
                     reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
+                case RESON_XFHZJ:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    settlement.setReason(reason);
+                    break;
             }
         }
         return settlementList;
@@ -930,6 +956,10 @@ public class SettementUtil {
                     reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
+                case RESON_XFHZJ:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    settlement.setReason(reason);
+                    break;
             }
         }
         return settlementList;
@@ -1124,7 +1154,9 @@ public class SettementUtil {
             }
             if (settlements.get(i).getEntryName().equals(BashInfo.JS_GCJS)||
                     settlements.get(i).getEntryName().equals(RESON_ZZJS)||
-                    settlements.get(i).getEntryName().equals(RESON_ZZFC)){
+                    settlements.get(i).getEntryName().equals(RESON_ZZFC)||
+                    settlements.get(i).getEntryName().equals(RESON_ZGTB)||
+                    settlements.get(i).getEntryName().equals(RESON_XFHZJ)){
                 reason+=RESON_JGJS8.replace("xxx",amout);
                 if (settlement.getStatus().equals("0")){
                     reason+=SettementUtil.RESON_TRUE;