2019-09-17 16：54

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

@@ -14,96 +14,95 @@ import java.util.ArrayList;
 import java.util.List;
 public class SettementUtil {
     private static final NumberFormat nf= NumberFormat.getInstance();
-    public static final String RESON_TRUE="&nbsp;(范围内)金额<span style='color:#0000FF'>&nbsp;一致。</span>";
-    public static final String RESON_FLASE="&nbsp;(范围内)金额<span style='color:#FF0000'>&nbsp;不一致。</span>";
+    public static final String RESON_TRUE="【范围内】&nbsp;金额<span style='color:#0000FF'>&nbsp;一致。</span>";
+    public static final String RESON_FLASE="【范围内】金额<span style='color:#FF0000'>&nbsp;不一致。</span>";
     public static final String BDZ_TBRNAME="投标人采购设备费";
     public static final String BDZ_ZBRNAME="招标人采购材料费";
     public static final String BDZ_TBNAME="投标报价";
     public static final String SE= "税额";
-
     /*
         分布分项比对
      */
-    public static final String RESON_FBFX1="《工程项目竣工结算汇总表》中“分部分项工程费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_FBFX2="《架空线路工程费用汇总表》中“分部分项汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_FBFX3="《分部分项工程量清单计价表》中“分部分项汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_FBFX1="《工程项目竣工结算汇总表》,分部分项工程费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_FBFX2="《架空线路工程费用汇总表》,分部分项汇总金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_FBFX3="《分部分项工程量清单计价表》,分部分项汇总金额,<span style='font-weight: bold;'>xxx</span>,";
     //电缆
-    public static final String RESON_JZFBFX="《电缆线路建筑工程费用汇总表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_AZFBFX="《电缆线路安装工程费用汇总表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JZFBFX3="《建筑分部分项工程量清单计价表》中“分部分项汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_AZFBFX3="《安装分部分项工程量清单计价表》中“分部分项汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_JZFBFX="《电缆线路建筑工程费用汇总表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_AZFBFX="《电缆线路安装工程费用汇总表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JZFBFX3="《建筑分部分项工程量清单计价表》,分部分项汇总金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_AZFBFX3="《安装分部分项工程量清单计价表》,分部分项汇总金额,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
-    public static final String BDZ_FXFX="《工程项目投标报价汇总表》中“分部分项工程费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_FBFX1="《变电站建筑工程费用汇总表》中“分部分项汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_FBFX2="《变电站安装工程费用汇总表》中“分部分项汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_FXFX="《工程项目投标报价汇总表》,分部分项工程费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_FBFX1="《变电站建筑工程费用汇总表》,分部分项汇总金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_FBFX2="《变电站安装工程费用汇总表》,分部分项汇总金额,<span style='font-weight: bold;'>xxx</span>,";
     /*
         承包人采购比对
      */
-    public static final String RESON_CBRF="《工程项目竣工结算汇总表》中“承包人采购设备费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_CBRF1="《承包人采购设备计价表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_CBRF="《工程项目竣工结算汇总表》,承包人采购设备费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_CBRF1="《承包人采购设备计价表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
-    public static final String BDZ_TBRCG="《工程项目投标报价汇总表》中“投标人采购设备费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_TBRCG1="《投标人采购设备计价表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_TBRCG="《工程项目投标报价汇总表》,投标人采购设备费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_TBRCG1="《投标人采购设备计价表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
     /*
         措施费比对
      */
-    public static final String RESON_CSXM="《工程项目竣工结算汇总表》中“措施项目费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_CSXM1="《措施项目清单计价表(一)》的“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_CSXM2="《措施项目清单计价表(二)》的“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_CSXM3="&nbsp;措施费总合计金额为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_CSXM="《工程项目竣工结算汇总表》,措施项目费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_CSXM1="《措施项目清单计价表(一)》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_CSXM2="《措施项目清单计价表(二)》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_CSXM3="&nbsp,小计,<span style='font-weight: bold;'>xxx</span>,";
    //变电站
-    public static final String BDZ_CSF="《工程项目投标报价汇总表》中“措施项目费”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_CSF="《工程项目投标报价汇总表》,措施项目费,<span style='font-weight: bold;'>xxx</span>,";
     /*
         其他项目费比对
      */
-    public static final String RESON_QTXM="《工程项目竣工结算汇总表》中“其他项目费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_QTXM1="《其他项目清单计价表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_QTXM="《工程项目竣工结算汇总表》,其他项目费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_QTXM1="《其他项目清单计价表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
-    public static final String BDZ_QTXM="《工程项目投标报价汇总表》中“其他项目费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_QTXM1="《其他项目清单计价表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_QTXM="《工程项目投标报价汇总表》,其他项目费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_QTXM1="《其他项目清单计价表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
     /*
         规费比对
      */
-    public static final String RESON_GF="《工程项目竣工结算汇总表》中“规费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_GF1="《规费项目清单计价表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_GF="《工程项目竣工结算汇总表》,规费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GF1="《规费项目清单计价表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
-    public static final String BDZ_GF="《工程项目投标报价汇总表》中“规费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_GF1="《规费项目清单计价表》中“合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_GF="《工程项目投标报价汇总表》,规费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_GF1="《规费项目清单计价表》,合计金额,<span style='font-weight: bold;'>xxx</span>,";
     /*
         税率 不验证
      */
-    public static final String RESON_SJ="《工程项目竣工结算汇总表》中税金 (税率: 9%)";
-    public static final String BDZ_SJ="《工程项目投标报价汇总表》中税金 (税率: 9%)";
+    public static final String RESON_SJ="《工程项目竣工结算汇总表》,税金 (税率: 9%)";
+    public static final String BDZ_SJ="《工程项目投标报价汇总表》,税金 (税率: 9%)";
     /*
         发包人采购费
      */
-    public static final String RESON_FBRF="《工程项目竣工结算汇总表》中“发包人采购材料费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_FBRF1="《分布分项工程量清单计价表》中“发包人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_FBRF2="《分布分项工程量清单计价表》中“招标人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_FBRF="《工程项目竣工结算汇总表》,发包人采购材料费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_FBRF1="《分布分项工程量清单计价表》,发包人采购汇总金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_FBRF2="《分布分项工程量清单计价表》,招标人采购汇总金额,<span style='font-weight: bold;'>xxx</span>,";
     //电缆
-    public static final String RESON_DLFBRF1="《建筑分布分项工程量清单计价表》中“发包人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_DLFBRF2="《安装分布分项工程量清单计价表》中“发包人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_DLFBRF1="《建筑分布分项工程量清单计价表》,发包人采购汇总金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_DLFBRF2="《安装分布分项工程量清单计价表》,发包人采购汇总金”,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
-    public static final String BDZ_FBRF="《工程项目投标报价汇总表》中“招标人采购材料费”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_FBRF1="《建筑分布分项工程量清单计价表》中“招标人采购金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_FBRF2="《安装分布分项工程量清单计价表》中“招标人采购金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_FBRF="《工程项目投标报价汇总表》,招标人采购材料费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_FBRF1="《建筑分布分项工程量清单计价表》,招标人采购金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_FBRF2="《安装分布分项工程量清单计价表》,招标人采购金额,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
     /*
         竣工结算
      */
-    public static final String RESON_JGJS="《工程项目竣工结算汇总表》中“竣工结算价合计金额”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS1="&nbsp;分部分项工程费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS2="&nbsp;承包人采购设备费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS3="&nbsp;措施项目费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS4="&nbsp;其他项目费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS5="&nbsp;规费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS6="&nbsp;税金为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS7="&nbsp;发包人材料费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_JGJS8="&nbsp;汇总金额为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_JGJS="《工程项目竣工结算汇总表》,竣工结算价合计金额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS1=",分部分项工程费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS2=",承包人采购设备费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS3=",措施项目费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS4=",其他项目费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS5=",规费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS6=",税金,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS7=",发包人材料费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_JGJS8=",小计,<span style='font-weight: bold;'>xxx</span>,";
     //变电站
-    public static final String BDZ_TBBJ="《工程项目投标报价汇总表》中“投标报价”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_TBBJ1="&nbsp;投标人采购设备费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String BDZ_TBBJ2="&nbsp;招标人材料费为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String BDZ_TBBJ="《工程项目投标报价汇总表》,投标报价,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_TBBJ1=",投标人采购设备费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String BDZ_TBBJ2=",招标人材料费,<span style='font-weight: bold;'>xxx</span>,";
     /*
         增补税率差额
      */
@@ -112,11 +111,11 @@ public class SettementUtil {
     /*
        工程结算
     */
-    public static final String RESON_GCJS="《工程项目竣工结算汇总表》中“工程结算价”为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_GCJS1="&nbsp;竣工结算家合计为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_GCJS2="&nbsp;补增值税税率调整差额为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_GCJS3="&nbsp;扣减甲供材超供材料费为<span style='font-weight: bold;'>xxx</span>元,";
-    public static final String RESON_GCJS4="&nbsp;汇总金额为<span style='font-weight: bold;'>xxx</span>元,";
+    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_GCJS2="《工程项目竣工结算汇总表》,补增值税税率调整差额,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS3="《工程项目竣工结算汇总表》,扣减甲供材超供材料费,<span style='font-weight: bold;'>xxx</span>,";
+    public static final String RESON_GCJS4="&nbsp;,小计,<span style='font-weight: bold;'>xxx</span>,";
     //工程投标 拼接数组
     public static final  String[] TOP2 = {BDZ_TBBJ,RESON_JGJS1,BDZ_TBBJ1,RESON_JGJS3, RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,BDZ_TBBJ2,RESON_JGJS8};
     //工程竣工 拼接数组
@@ -264,45 +263,30 @@ public class SettementUtil {
             settlement.setStatus("1");
             switch (name){
                 case BashInfo.JS_FBFX:
-//                    if (money==builtTotal&&money==divisiontotal[0]){
-//                        settlement.setStatus("0");
-//                    }
                     if(builtTotal<=moneyComparison1&&builtTotal>=moneyComparison2&&divisiontotal[0]<=moneyComparison1&&divisiontotal[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(builtTotal)+","+nf.format(divisiontotal[0])));
                     break;
                 case  BashInfo.JS_CBRF:
-//                    if(money==cbperson){
-//                        settlement.setStatus("0");
-//                    }
                     if(cbperson<=moneyComparison1&&cbperson>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
                     break;
                 case BashInfo.JS_CSXM:
-//                    if (money==wordtotal){
-//                        settlement.setStatus("0");
-//                    }
                     if(wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(wordtotal1)+","+nf.format(wordtotal2)+","+nf.format(wordtotal)));
                     break;
                 case BashInfo.JS_QTXM:
-//                    if(money==otherTotal){
-//                        settlement.setStatus("0");
-//                    }
                     if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(otherTotal)));
                     break;
                 case BashInfo.JS_GF:
-//                    if (money==feescount){
-//                        settlement.setStatus("0");
-//                    }
                     if (feescount<=moneyComparison1&&feescount>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -313,9 +297,6 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(nf.format(money)));
                     break;
                 case BashInfo.JS_FBRF:
-//                    if(money==divisiontotal[1]){
-//                        settlement.setStatus("0");
-//                    }
                     if(divisiontotal[1]<=moneyComparison1&&divisiontotal[1]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -323,15 +304,11 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_JGJS:
                     double[] doubles = getJgjsComparison(settlements,opinion);
-//                    if (money==doubles[0]){
-//                        settlement.setStatus("0");
-//                    }
                     if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles[0])+','+nf.format(doubles[1])+','+nf.format(doubles[2])+','+nf.format(doubles[3])
                             +','+nf.format(doubles[4])+','+nf.format(doubles[5])+','+nf.format(doubles[6])+','+nf.format(doubles[7]));
-//                    settlement.setTheAmount(StringUtils.join(jgComparison,','));
                     settlement.setTheAmount(str);
                     break;
                 case BashInfo.JS_BZZS:
@@ -344,9 +321,6 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_GCJS:
                     double[] gcComparison =getGcComparison(settlements);
-//                    if (money==gcComparison[0]){
-//                        settlement.setStatus("0");
-//                    }
                     if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -354,7 +328,6 @@ public class SettementUtil {
                             nf.format(gcComparison[1])+','
                             +nf.format(gcComparison[2])+','+
                             nf.format(gcComparison[3]));
-//                    settlement.setTheAmount(StringUtils.join(gcComparison,','));
                     settlement.setTheAmount(gc);
                     break;
             }
@@ -405,45 +378,30 @@ public class SettementUtil {
                 case BashInfo.JS_FBFX:
                     double division=divisiontotal[0]+divisiontotal[2];//分工清单分部分项
                     double built = builtTotal[0]+builtTotal[1];//安装合计总金额
-//                    if (money==built&&money==division){
-//                        settlement.setStatus("0");
-//                    }
                     if(built<=moneyComparison1&&built>=moneyComparison2&&division<=moneyComparison1&&division>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(built)+","+nf.format(division)+","+nf.format(builtTotal[0])+","+nf.format(builtTotal[1])+","+nf.format(divisiontotal[0])+","+nf.format(divisiontotal[2])));
                     break;
                 case  BashInfo.JS_CBRF:
-//                    if(money==cbperson){
-//                        settlement.setStatus("0");
-//                    }
                     if(cbperson<=moneyComparison1&&cbperson>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
                     break;
                 case BashInfo.JS_CSXM:
-//                    if (money==wordtotal){
-//                        settlement.setStatus("0");
-//                    }
                     if (wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(wordtotal1)+","+nf.format(wordtotal2)+","+nf.format(wordtotal)));
                     break;
                 case BashInfo.JS_QTXM:
-//                    if(money==otherTotal){
-//                        settlement.setStatus("0");
-//                    }
                     if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(otherTotal)));
                     break;
                 case BashInfo.JS_GF:
-//                    if (money==feescount){
-//                        settlement.setStatus("0");
-//                    }
                     if (feescount<=moneyComparison1&&feescount>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -455,9 +413,6 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_FBRF:
                     double divisionFbr =divisiontotal[1]+divisiontotal[3];
-//                    if(money==divisionFbr){
-//                        settlement.setStatus("0");
-//                    }
                     if(divisionFbr<=moneyComparison1&&divisionFbr>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -465,15 +420,11 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_JGJS:
                     double[] doubles = getJgjsComparison(settlements,opinion);
-//                    if (money==doubles[0]){
-//                        settlement.setStatus("0");
-//                    }
                     if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles[0])+','+nf.format(doubles[1])+','+nf.format(doubles[2])+','+nf.format(doubles[3])
                             +','+nf.format(doubles[4])+','+nf.format(doubles[5])+','+nf.format(doubles[6])+','+nf.format(doubles[7]));
-//                    settlement.setTheAmount(StringUtils.join(jgComparison,','));
                     settlement.setTheAmount(str);
                     break;
                 case BashInfo.JS_BZZS:
@@ -486,9 +437,6 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_GCJS:
                     double[] gcComparison =getGcComparison(settlements);
-//                    if (money==gcComparison[0]){
-//                        settlement.setStatus("0");
-//                    }
                     if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -496,7 +444,6 @@ public class SettementUtil {
                             nf.format(gcComparison[1])+','
                             +nf.format(gcComparison[2])+','+
                             nf.format(gcComparison[3]));
-//                    settlement.setTheAmount(StringUtils.join(gcComparison,','));
                     settlement.setTheAmount(gc);
                     break;
             }
@@ -515,10 +462,6 @@ public class SettementUtil {
         double money=0;
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
-            //读取字段区分
-//            if(name.contains(SJ)){
-//                name=BashInfo.JS_SJ;
-//            }
             if(name.equals(BDZ_TBRNAME)){
                 name=BashInfo.JS_CBRF;
             }
@@ -796,7 +739,7 @@ public class SettementUtil {
             }
             switch (key){
                 case BashInfo.JS_FBFX:
-                    reason = getDJoint(settlement,DLBDZ_FBFX1);
+                    reason = getDJoint(settlement,DLBDZ_FBFX2);
                     settlement.setReason(reason);
                     break;
                 case  BDZ_TBRNAME:
@@ -869,11 +812,11 @@ public class SettementUtil {
     public static String getFbfxJoint(Settlement settlement){
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
-        String reason1=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))+"<br>"+SettementUtil.RESON_FBFX2.replace("xxx",amout[0]);
-        String reason2=SettementUtil.RESON_FBFX2.replace("xxx",amout[0])+"<br>"+SettementUtil.RESON_FBFX3.replace("xxx",amout[1]);
+        String reason1=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))+SettementUtil.RESON_FBFX2.replace("xxx",amout[0]);
+        String reason2=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))+SettementUtil.RESON_FBFX3.replace("xxx",amout[1]);
         String status =settlement.getStatus();
         if(status.equals("0")){
-            reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+            reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_TRUE;
         }
         if(status.equals("1")){
             double money = settlement.getMoney();
@@ -882,28 +825,19 @@ public class SettementUtil {
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
             if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
-                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
             }
             if(amout1!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
             }
             if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout1==amout2){
-                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_TRUE;
             }
-//            if(money!=amout1&&amout1!=amout2){
-//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-//            }
-//            if(amout1!=amout2&&money==amout1){
-//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-//            }
-//            if (money!=amout1&&amout1==amout2){
-//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
-//            }
         }
         return reason;
     }
     /**
-     * 获取 电缆 分部分项  reason 值
+     * 获取 电缆/变电站 分部分项  reason 值
      * @param settlement bean
      * @return reason
      */
@@ -911,16 +845,16 @@ public class SettementUtil {
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
         String reason1=tips[0].replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+tips[1].replace("xxx",amout[2])
-                +"<br>"+tips[2].replace("xxx",amout[3])
-                +"<br>"+tips[3].replace("xxx",amout[0]);
+                +tips[1].replace("xxx",amout[2])
+                +tips[2].replace("xxx",amout[3])
+                +tips[3].replace("xxx",amout[0]);
         String reason2=tips[0].replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+tips[4].replace("xxx",amout[4])
-                +"<br>"+tips[5].replace("xxx",amout[5])
-                +"<br>"+tips[6].replace("xxx",amout[1]);
+                +tips[4].replace("xxx",amout[4])
+                +tips[5].replace("xxx",amout[5])
+                +tips[6].replace("xxx",amout[1]);
         String status =settlement.getStatus();
         if(status.equals("0")){
-            reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+            reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_TRUE;
         }
         if(status.equals("1")){
             double money = settlement.getMoney();
@@ -929,64 +863,18 @@ public class SettementUtil {
             double moneyComparison1=money+5.0;//范围金额+5.0元
             double moneyComparison2=money-5.0;//范围金额-5.0元
             if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
-                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
             }
             if(money!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
+                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
             }
             if (money!=amout1&&amout2<=moneyComparison1&&amout2>=moneyComparison2){
-                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
+                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
             }
-//            if(money!=amout1&&money!=amout2){
-//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-//            }
-//            if(money!=amout2&&money==amout1){
-//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-//            }
-//            if (money!=amout1&&money==amout2){
-//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
-//            }
         }
         return reason;
     }
-//    /**
-//     * 获取 变电站 分部分项 reason值
-//     * @param settlement bean
-//     * @return reason
-//     */
-//    public static String getBdzJoint(Settlement settlement){
-//        String reason="";
-//        String[] amout=settlement.getTheAmount().split(",");
-//        String reason1=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-//                +"<br>"+SettementUtil.BDZ_FBFX1.replace("xxx",amout[2])
-//                +"<br>"+SettementUtil.BDZ_FBFX2.replace("xxx",amout[3])
-//                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
-//        String reason2=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(settlement.getMoney()))
-//                +"<br>"+SettementUtil.RESON_JZFBFX3.replace("xxx",amout[4])
-//                +"<br>"+SettementUtil.RESON_AZFBFX3.replace("xxx",amout[5])
-//                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[1]);
-//        String status =settlement.getStatus();
-//        if(status.equals("0")){
-//            reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
-//        }
-//        if(status.equals("1")){
-//            double money = settlement.getMoney();
-//            double amout1 = Double.valueOf(amout[0]);
-//            double amout2 = Double.valueOf(amout[1]);
-//            double moneyComparison1=money+5.0;//范围金额+5.0元
-//            double moneyComparison2=money-5.0;//范围金额-5.0元
-//            if(money!=amout1&&money!=amout2){
-//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-//            }
-//            if(money!=amout2&&money==amout1){
-//                reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
-//            }
-//            if (money!=amout1&&money==amout2){
-//                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
-//            }
-//        }
-//        return reason;
-//    }
+
     /**
      *  规费/其他费 等 计算 数据 常量匹配
      * @param constant1   匹配的常量one
@@ -998,11 +886,11 @@ public class SettementUtil {
         String reason="";
         String status=settlement.getStatus();
         reason=constant1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+constant2.replace("xxx",settlement.getTheAmount());
+                +constant2.replace("xxx",settlement.getTheAmount());
         if (status.equals("0")){
-            reason+="<br>"+SettementUtil.RESON_TRUE;
+            reason+=SettementUtil.RESON_TRUE;
         }else {
-            reason+="<br>"+SettementUtil.RESON_FLASE;
+            reason+=SettementUtil.RESON_FLASE;
         }
         return reason;
     }
@@ -1017,13 +905,13 @@ public class SettementUtil {
         String status =settlement.getStatus();
         String[] amout=settlement.getTheAmount().split(",");
         String reason=csxm.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+RESON_CSXM1.replace("xxx",amout[0])+
-                "<br>"+RESON_CSXM2.replace("xxx",amout[1])+
-                "<br>"+RESON_CSXM3.replace("xxx",amout[2]);
+                +RESON_CSXM1.replace("xxx",amout[0])+
+                RESON_CSXM2.replace("xxx",amout[1])+
+                RESON_CSXM3.replace("xxx",amout[2]);
         if (status.equals("0")){
-            reason+="<br>"+RESON_TRUE;
+            reason+=RESON_TRUE;
         }else {
-            reason+="<br>"+RESON_FLASE;
+            reason+=RESON_FLASE;
         }
         return reason;
     }
@@ -1038,13 +926,13 @@ public class SettementUtil {
         String[] amout = settlement.getTheAmount().split(",");
         String status=settlement.getStatus();
         reason=s.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
-                +"<br>"+s1.replace("xxx",amout[1])
-                +"<br>"+s2.replace("xxx",amout[2])
-                +"<br>"+RESON_GCJS4.replace("xxx",amout[0]);
+                +s1.replace("xxx",amout[1])
+                +s2.replace("xxx",amout[2])
+                +RESON_GCJS4.replace("xxx",amout[0]);
         if (status.equals("0")){
-            reason+="<br>"+SettementUtil.RESON_TRUE;
+            reason+=SettementUtil.RESON_TRUE;
         }else {
-            reason+="<br>"+SettementUtil.RESON_FLASE;
+            reason+=SettementUtil.RESON_FLASE;
         }
         return reason;
     }
@@ -1060,31 +948,31 @@ public class SettementUtil {
         String[] amout=settlement.getTheAmount().split(",");
         reason+=tops[0].replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         if (booleans[1]){
-            reason+="<br>"+tops[1].replace("xxx",amout[1]);
+            reason+=tops[1].replace("xxx",amout[1]);
         }
         if (booleans[2]){
-            reason+="<br>"+tops[2].replace("xxx",amout[2]);
+            reason+=tops[2].replace("xxx",amout[2]);
         }
         if (booleans[3]){
-            reason+="<br>"+tops[3].replace("xxx",amout[3]);
+            reason+=tops[3].replace("xxx",amout[3]);
         }
         if (booleans[4]){
-            reason+="<br>"+tops[4].replace("xxx",amout[4]);
+            reason+=tops[4].replace("xxx",amout[4]);
         }
         if (booleans[5]){
-            reason+="<br>"+tops[5].replace("xxx",amout[5]);
+            reason+=tops[5].replace("xxx",amout[5]);
         }
         if (booleans[6]){
-            reason+="<br>"+tops[6].replace("xxx",amout[6]);
+            reason+=tops[6].replace("xxx",amout[6]);
         }
         if (booleans[7]){
-            reason+="<br>"+tops[7].replace("xxx",amout[7]);
+            reason+=tops[7].replace("xxx",amout[7]);
         }
-        reason+="<br>"+tops[8].replace("xxx",amout[0]);
+        reason+=tops[8].replace("xxx",amout[0]);
         if (settlement.getStatus().equals("0")){
-            reason+="<br>"+SettementUtil.RESON_TRUE;
+            reason+=SettementUtil.RESON_TRUE;
         }else {
-            reason+="<br>"+SettementUtil.RESON_FLASE;
+            reason+=SettementUtil.RESON_FLASE;
         }
         return reason;
     }
@@ -1100,19 +988,19 @@ public class SettementUtil {
         String[] amout=settlement.getTheAmount().split(",");
         reason+=RESON_GCJS.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         if (booleans[8]){
-            reason+="<br>"+RESON_GCJS1.replace("xxx",amout[1]);
+            reason+=RESON_GCJS1.replace("xxx",amout[1]);
         }
         if (booleans[9]){
-            reason+="<br>"+RESON_GCJS2.replace("xxx",amout[2]);
+            reason+=RESON_GCJS2.replace("xxx",amout[2]);
         }
         if (booleans[10]) {
-            reason += "<br>" + RESON_GCJS3.replace("xxx", amout[3]);
+            reason +=RESON_GCJS3.replace("xxx", amout[3]);
         }
-        reason+="<br>"+RESON_GCJS4.replace("xxx",amout[0]);
+        reason+=RESON_GCJS4.replace("xxx",amout[0]);
         if (settlement.getStatus().equals("0")){
-            reason+="<br>"+SettementUtil.RESON_TRUE;
+            reason+=SettementUtil.RESON_TRUE;
         }else {
-            reason+="<br>"+SettementUtil.RESON_FLASE;
+            reason+=SettementUtil.RESON_FLASE;
         }
         return reason;
     }

src/main/webapp/webpage/modules/sg/free/alongst.js

@@ -111,7 +111,6 @@
         });
     }
     };
-
         $('.suretable .layui-btn').on('click', function(){
             var type = $(this).data('type');
             active[type] ? active[type].call(this) : '';

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -307,9 +307,9 @@ table.on('tool(settle)', function(obj){
             type: 1,
             title:data.setname,
             // skin: 'layui-layer-rim',
-            area: ['700px', '90%'],
+            area: ['80%', '90%'],
             // content: "<div style='padding: 16px'>"+data.reason+"</div>"
-            content: tips(data)
+            content: div_table(data)
         });
     }
 });
@@ -321,58 +321,4 @@ function doIt(val){ //科学计数法
     var num = new Number(val);
     return num;
 }
-function tips(data) {
-  var div = "<div style='padding: 16px'>"+data.reason+"</div>";
-  // var div = "<div className='layui-form'>"+
-  //   "<table className='layui-table'>"+
-  //   "<colgroup>"+
-  //   "<col width='150'>"+
-  //   "<col width='150'>"+
-  //   "<col width='200'>"+
-  //   "<col>"+
-  //   "</colgroup>"+
-  //   "<thead>"+
-  //   "<tr>"+
-  //   "<th>人物</th>"+
-  //   "<th>民族</th>"+
-  //   "<th>出场时间</th>"+
-  //   "<th>格言</th>"+
-  //   "</tr>"+
-  //   "</thead>"+
-  //   "<tbody>"+
-  //   "<tr>"+
-  //   "<td>贤心</td>"+
-  //   "<td>汉族</td>"+
-  //   "<td>1989-10-14</td>"+
-  //   "<td>人生似修行</td>"+
-  //   "</tr>"+
-  //   "<tr>"+
-  //   "<td>张爱玲</td>"+
-  //   "<td>汉族</td>"+
-  //   "<td>1920-09-30</td>"+
-  //   "<td>于千万人之中遇见你所遇见的人，于千万年之中，时间的无涯的荒野里…</td>"+
-  //   "</tr>"+
-  //   "<tr>"+
-  //   "<td>Helen Keller</td>"+
-  //   "<td>拉丁美裔</td>"+
-  //   "<td>1880-06-27</td>"+
-  //   "<td> Life is either a daring adventure or nothing.</td>"+
-  //   "</tr>"+
-  //   "<tr>"+
-  //   "<td>岳飞</td>"+
-  //   "<td>汉族</td>"+
-  //   "<td>1103-北宋崇宁二年</td>"+
-  //   "<td>教科书再滥改，也抹不去“民族英雄”的事实</td>"+
-  //   "</tr>"+
-  //   "<tr>"+
-  //   "<td>孟子</td>"+
-  //   "<td>华夏族（汉族）</td>"+
-  //   "<td>公元前-372年</td>"+
-  //   "<td>猿强，则国强。国强，则猿更强！ </td>"+
-  //   "</tr>"+
-  //   "</tbody>"+
-  //   "</table>"+
-  //   "</div>";
-    return div;
-}
 </script>

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -75,10 +75,101 @@
         <input hidden="hidden" name="" id="fyje1" value=""/>
         <table class="layui-hide" id="xmmc" lay-filter="freestr"></table>
     </div>
+    <div class="layui-form" style="display: none;padding: 12px" id="mydiv">
+        <table class="layui-table">
+            <colgroup>
+                <col width="150">
+                <col width="150">
+                <col width="200">
+                <col>
+            </colgroup>
+            <thead>
+            <tr>
+                <th>表名</th>
+                <th>费用名称</th>
+                <th>金额</th>
+            </tr>
+            </thead>
+            <tbody id="mytbody1">
+            </tbody>
+        </table>
+        <span id="myspan1" style="font-weight: bold;font-size: 15px">【范围内】&nbsp;金额一致</span>
+        <table class="layui-table" id="hide">
+            <colgroup>
+            <col width="150">
+            <col width="150">
+            <col width="200">
+            <col>
+            </colgroup>
+            <thead>
+            <tr>
+                <th>表名</th>
+                <th>费用名称</th>
+                <th>金额</th>
+            </tr>
+            </thead>
+            <tbody id="mytbody2">
+            </tbody>
+        </table>
+        <span id="myspan2" style="font-weight: bold;font-size: 15px"></span>
+    </div>
     <div style="width: 100%;height: 100px"></div>
     <script type="text/html" id="barDemo">
         <a class="layui-btn  layui-btn-xs" lay-event="fttz">分摊调整</a>
         <a class="layui-btn layui-btn-xs" lay-event="ddtz">单独调整</a>
     </script>
 </body>
+<script>
+    function div_table(data) {
+        $("#mytbody1").html("");
+        $("#mytbody2").html("");
+        var name = data.setname;
+        var arr  = data.reason.split(',');
+        var count = 0;
+        for (var i = 0; i < arr.length;i+=3) {
+            if(name=="分部分项工程费"){
+                $("#hide").show();
+                $("#myspan2").show();
+                if (arr[i].indexOf("《工程项目竣工结算汇总表》")!=-1||arr[i].indexOf("《工程项目投标报价汇总表》")!=-1){
+                    count+=1;
+                }
+                if(count<=1){
+                    //《工程项目竣工结算汇总表》
+                    if(arr[i].indexOf("范围内")!=-1) {
+                        $("#myspan1").html(arr[i]);
+                    }else{
+                        var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+                        $("#mytbody1").append(tr);
+                    }
+                }else {
+                    if(arr[i].indexOf("范围内")!=-1) {
+                        $("#myspan2").html(arr[i]);
+                        // $("#myspan1").html(count);
+                    }else{
+                        var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+                        $("#mytbody2").append(tr);
+                    }
+                }
+            }else {
+                $("#hide").hide();
+                $("#myspan2").hide();
+                if(arr[i].indexOf("范围内")!=-1) {
+                    $("#myspan1").html(arr[i]);
+                    // $("#myspan1").html(count);
+                }else{
+                    var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+                    $("#mytbody1").append(tr);
+                }
+            }
+            // if(arr[i].indexOf("范围内")!=-1) {
+            //     $("#myspan1").html(arr[i]);
+            //     // $("#myspan1").html(count);
+            // }else{
+            //     var tr  =  "<tr><td>"+arr[i]+"</td><td>"+arr[i+1]+"</td><td>"+arr[i+2]+"</td></tr>"
+            //     $("#mytbody1").append(tr);
+            // }
+        }
+        return $("#mydiv");
+    }
+</script>
 </html>