2019-09-25 19:39

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

@@ -30,6 +30,9 @@ public class SettementUtil {
     public static final String RESON_ZZJS="最终结算价";
     public static final String RESON_ZZFC="最终工程造价";
     public static final String RESON_ZGTB="最高投标限价";
+    public static final String RESON_FBFXGCF1="建筑工程费";
+    public static final String RESON_FBFXGCF2="安装工程费";
+
     /*
         分布分项比对
      */
@@ -124,6 +127,8 @@ public class SettementUtil {
     public static List<Settlement> getComparison(ImportExcel importExcel){
         List<JkxlAdjustFee> jkxlAdjustFees = BashInfo.getWsbFee(importExcel);
         boolean flag = false;//判断 是否是变电站
+        boolean flagTotal= true;//判断是否有分部分项
+        double countTotal=0.0;//安装/建筑合计金额
         Settlement settlement;
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();
@@ -160,7 +165,14 @@ public class SettementUtil {
                 key=BashInfo.JS_JGJS;
             }
             switch (key){
+                case RESON_FBFXGCF1:
+                    countTotal+=importExcel.getDouble(i+1,2);
+                    break;
+                case RESON_FBFXGCF2:
+                    countTotal+=importExcel.getDouble(i+1,2);
+                    break;
                 case BashInfo.JS_FBFX:
+                    flagTotal=false;
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
                 case BashInfo.JS_CBRF:
@@ -235,6 +247,12 @@ public class SettementUtil {
                     break;
             }
         }
+        if (flagTotal){
+            settlement=new Settlement();
+            settlement.setEntryName(BashInfo.JS_FBFX);
+            settlement.setMoney(countTotal);
+            settlementList.add(0,settlement);
+        }
         return settlementList;
     }
 
@@ -252,8 +270,8 @@ public class SettementUtil {
      */
     public static List<Settlement> getComparison(List<Settlement> settlements, double builtTotal, double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson){
         double wordtotal=wordtotal1+wordtotal2;//措施费相加
-        String name;//获取当前汇总表名称
-        double money;//获取当前汇总表金额
+        String name="";//获取当前汇总表名称
+        double money=0.0;//获取当前汇总表金额
         Settlement settlement;//对象
         double moneyComparison1;//范围金额+5.0元
         double moneyComparison2;//范围金额-5.0元