2019-09-25 15:47

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

@@ -24,7 +24,8 @@ public class SettementUtil {
     public static final String SE= "税额";
     public static final String RESON_KYJ="扣";
     public static final String RESON_KYJ1="减";
-    public static final String RESON_ZZJS="最终工程造价";
+    public static final String RESON_ZZJS="最终结算价";
+    public static final String RESON_ZZFC="最终工程造价";
     /*
         分布分项比对
      */
@@ -104,6 +105,7 @@ public class SettementUtil {
     */
     public static final String RESON_GCJS="《工程项目竣工结算汇总表》,结算价,<span style='font-weight: bold;'>xxx</span>,";
     public static final String RESON_GCJS1="《工程项目竣工结算汇总表》,结算价,<span style='font-weight: bold;'>xxx</span>,";
+
     public static final String[] DLBDZ_FBFX2 = {RESON_FBFX1,BDZ_FBFX1,BDZ_FBFX2,RESON_JGJS8,RESON_JZFBFX3,RESON_AZFBFX3,RESON_JGJS8};
     public static final String[] DLBDZ_FBFX1 = {RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_JGJS8,RESON_JZFBFX3,RESON_AZFBFX3,RESON_JGJS8};
     /*
@@ -150,6 +152,11 @@ public class SettementUtil {
                 key = BashInfo.JS_GCJS;
                 flag=true;
             }
+            if (key.equals(RESON_ZZFC)){
+                key = BashInfo.JS_GCJS;
+                flag=true;
+            }
+
             switch (key){
                 case BashInfo.JS_FBFX:
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
@@ -208,7 +215,11 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_GCJS:
                     if (flag){
-                        key=RESON_ZZJS;
+                        if (key.equals(RESON_ZZJS)){
+                            key=RESON_ZZJS;
+                        }else {
+                            key = RESON_ZZFC;
+                        }
                         flag=false;
                     }
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
@@ -259,6 +270,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
             money=settlement.getMoney();
             moneyComparison1 = money+5.0;
             moneyComparison2 = money-5.0;
@@ -368,6 +382,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
             //获取金额
             money=settlement.getMoney();
             moneyComparison1 = money+5.0;
@@ -476,6 +493,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
             switch (name) {
                 case BashInfo.JS_FBFX:
                     doubles[1]=money;
@@ -565,6 +585,9 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
             money =settlement.getMoney();
             switch (name) {
                 case BashInfo.JS_FBRF:
@@ -614,7 +637,6 @@ public class SettementUtil {
                 key = BashInfo.JS_JGJS;
             }
             if (key.equals(RESON_ZZJS)){
-                flag = true;
                 key = BashInfo.GCJS;
             }
             switch (key){
@@ -669,12 +691,11 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case BashInfo.GCJS:
-                    if(flag){
-                        settlement.setEntryName(RESON_ZZJS);
-                        reason=getJshzJoint(RESON_GCJS1,settlement,settlementList);
-                    }else {
-                        reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
-                    }
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    settlement.setReason(reason);
+                    break;
+                case RESON_ZZFC:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
             }
@@ -705,7 +726,6 @@ public class SettementUtil {
                 key = BashInfo.JS_JGJS;
             }
             if (key.equals(RESON_ZZJS)){
-                flag = true;
                 key = BashInfo.GCJS;
             }
             switch (key){
@@ -760,12 +780,11 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case BashInfo.GCJS:
-                    if(flag){
-                        settlement.setEntryName(RESON_ZZJS);
-                        reason=getJshzJoint(RESON_GCJS1,settlement,settlementList);
-                    }else {
-                        reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
-                    }
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    settlement.setReason(reason);
+                    break;
+                case RESON_ZZFC:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
             }
@@ -798,7 +817,7 @@ public class SettementUtil {
                 key = BDZ_TBNAME;
             }
             if (key.equals(RESON_ZZJS)){
-                flag = true;
+//                flag = true;
                 key = BashInfo.GCJS;
             }
             switch (key){
@@ -853,12 +872,10 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case BashInfo.GCJS:
-                    if(flag){
-                        settlement.setEntryName(RESON_ZZJS);
-                        reason=getJshzJoint(RESON_GCJS1,settlement,settlementList);
-                    }else {
-                        reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
-                    }
+                    settlement.setReason(reason);
+                    break;
+                case RESON_ZZFC:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
             }
@@ -1053,7 +1070,9 @@ public class SettementUtil {
             if (settlements.get(i).getEntryName().equals(BashInfo.JS_JGJS)){
                 continue;
             }
-            if (settlements.get(i).getEntryName().equals(BashInfo.JS_GCJS)||settlements.get(i).getEntryName().equals(RESON_ZZJS)){
+            if (settlements.get(i).getEntryName().equals(BashInfo.JS_GCJS)||
+                    settlements.get(i).getEntryName().equals(RESON_ZZJS)||
+                    settlements.get(i).getEntryName().equals(RESON_ZZFC)){
                 reason+=RESON_JGJS8.replace("xxx",amout);
                 if (settlement.getStatus().equals("0")){
                     reason+=SettementUtil.RESON_TRUE;