Merge remote-tracking branch 'origin/master'

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

@@ -5,6 +5,7 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.utils.sg.ExcelUtil;
 import com.jeeplus.modules.sg.overheadline.entity.JkxlAdjustFee;
 import com.jeeplus.modules.sg.overheadline.entity.Settlement;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
@@ -22,9 +23,13 @@ public class SettementUtil {
     public static final String BDZ_ZBRNAME="招标人采购材料费";
     public static final String BDZ_TBNAME="投标报价";
     public static final String SE= "税额";
+    public static final String ST = "税金调差";
+    public static final String SE1= "税额调差";
     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="最终工程造价";
+    public static final String RESON_ZGTB="最高投标限价";
     /*
         分布分项比对
      */
@@ -102,8 +107,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 RESON_GCJS="工程项目汇总表,结算价,<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};
     /*
@@ -129,10 +133,19 @@ public class SettementUtil {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
             if (key.contains(BashInfo.JS_SJ)){
-                key=BashInfo.JS_SJ;
+                if (key.contains(ST)){
+                    key=ST;
+                }else {
+                    key=BashInfo.JS_SJ;
+                }
+
             }
             if(key.contains(SE)){
-                key=BashInfo.JS_SJ;
+                if (key.contains(SE1)){
+                    key=SE1;
+                }else {
+                    key=BashInfo.JS_SJ;
+                }
             }
             if(key.equals(BDZ_TBRNAME)){
                 flag=true;
@@ -146,10 +159,6 @@ public class SettementUtil {
                 flag=true;
                 key=BashInfo.JS_JGJS;
             }
-            if (key.equals(RESON_ZZJS)){
-                key = BashInfo.JS_GCJS;
-                flag=true;
-            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
@@ -199,6 +208,12 @@ public class SettementUtil {
                     }
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
+                case ST:
+                    settlementList.add(getSettlement(settlement,ST,importExcel,i));
+                    break;
+                case SE1:
+                    settlementList.add(getSettlement(settlement,ST,importExcel,i));
+                    break;
                 case BashInfo.JS_JGJS:
                     if (flag){
                         key=BDZ_TBNAME;
@@ -207,14 +222,24 @@ public class SettementUtil {
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
                 case BashInfo.JS_GCJS:
-                    if (flag){
-                        key=RESON_ZZJS;
-                        flag=false;
-                    }
+                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    break;
+                case RESON_ZZFC:
+                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    break;
+                case RESON_ZZJS:
+                    settlementList.add(getSettlement(settlement,key,importExcel,i));
+                    break;
+                case RESON_ZGTB:
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
             }
         }
+        System.out.println("111111111111111111111111111");
+        for (int i = 0; i < settlementList.size(); i++) {
+            System.out.println(settlementList.get(i).getEntryName());
+        }
+        System.out.println("111111111111111111111111111");
         return settlementList;
     }
 
@@ -259,6 +284,12 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
+            if (name.equals(RESON_ZGTB)){
+                name = BashInfo.JS_GCJS;
+            }
             money=settlement.getMoney();
             moneyComparison1 = money+5.0;
             moneyComparison2 = money-5.0;
@@ -368,6 +399,12 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
+            if (name.equals(RESON_ZGTB)){
+                name = BashInfo.JS_GCJS;
+            }
             //获取金额
             money=settlement.getMoney();
             moneyComparison1 = money+5.0;
@@ -476,6 +513,12 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
+            if (name.equals(RESON_ZGTB)){
+                name = BashInfo.JS_GCJS;
+            }
             switch (name) {
                 case BashInfo.JS_FBFX:
                     doubles[1]=money;
@@ -565,6 +608,12 @@ public class SettementUtil {
             if (name.equals(RESON_ZZJS)){
                 name = BashInfo.JS_GCJS;
             }
+            if (name.equals(RESON_ZZFC)){
+                name = BashInfo.JS_GCJS;
+            }
+            if (name.equals(RESON_ZGTB)){
+                name = BashInfo.JS_GCJS;
+            }
             money =settlement.getMoney();
             switch (name) {
                 case BashInfo.JS_FBRF:
@@ -614,7 +663,6 @@ public class SettementUtil {
                 key = BashInfo.JS_JGJS;
             }
             if (key.equals(RESON_ZZJS)){
-                flag = true;
                 key = BashInfo.GCJS;
             }
             switch (key){
@@ -669,12 +717,15 @@ 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;
+                case RESON_ZGTB:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
             }
@@ -705,7 +756,6 @@ public class SettementUtil {
                 key = BashInfo.JS_JGJS;
             }
             if (key.equals(RESON_ZZJS)){
-                flag = true;
                 key = BashInfo.GCJS;
             }
             switch (key){
@@ -760,12 +810,15 @@ 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;
+                case RESON_ZGTB:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
             }
@@ -797,10 +850,6 @@ public class SettementUtil {
                 flag=true;
                 key = BDZ_TBNAME;
             }
-            if (key.equals(RESON_ZZJS)){
-                flag = true;
-                key = BashInfo.GCJS;
-            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getDJoint(settlement,DLBDZ_FBFX2);
@@ -853,12 +902,19 @@ 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;
+                case RESON_ZZJS:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
+                    settlement.setReason(reason);
+                    break;
+                case RESON_ZGTB:
+                    reason=getJshzJoint(RESON_GCJS,settlement,settlementList);
                     settlement.setReason(reason);
                     break;
             }
@@ -1053,7 +1109,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;