Merge remote-tracking branch 'origin/master'

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

@@ -327,7 +327,7 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(nf.format(money)));
                     break;
                 case BashInfo.JS_GCJS:
-                    double[] gcComparison =getGcComparison(settlements);
+                    double[] gcComparison =getGcComparison(settlements,opinion);
                     if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -446,7 +446,7 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(money));
                     break;
                 case BashInfo.JS_GCJS:
-                    double[] gcComparison =getGcComparison(settlements);
+                    double[] gcComparison =getGcComparison(settlements,opinion);
                     if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
@@ -470,7 +470,7 @@ public class SettementUtil {
         double[] doubles = new double[8];
         String name;
         double money=0;
-        double kyj = 0.0;
+        double minus = 0.0;
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
             if(name.equals(BDZ_TBRNAME)){
@@ -506,14 +506,14 @@ public class SettementUtil {
                     doubles[7]=money;
                     break;
                 case RESON_KYJ:
-                    kyj = money;
+                    minus = money;
                     break;
             }
         }
         if (opinion){
-            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7]-kyj;
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7]-minus;
         }else {
-            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-kyj;
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-minus;
         }
         return doubles;
     }
@@ -522,16 +522,48 @@ public class SettementUtil {
      * @param settlements 《工程项目结算汇总表》 集合
      * @return double[] 计算匹配数据集合
      */
-    public static double[] getGcComparison(List<Settlement> settlements){
+    public static double[] getGcComparison(List<Settlement> settlements,boolean opinion){
         double[] doubles=new double[4];
+        double[] doubles1 = new double[8];
         String name;
         double money=0;
+        double minus = 0.0;
         for (Settlement settlement:settlements){
             name = settlement.getEntryName();
+            if(name.equals(BDZ_TBRNAME)){
+                name=BashInfo.JS_CBRF;
+            }
+            if (name.equals(BDZ_ZBRNAME)){
+                name=BashInfo.JS_FBRF;
+            }
+            if (name.equals(BDZ_TBNAME)){
+                name=BashInfo.JS_JGJS;
+            }
             money =settlement.getMoney();
             switch (name) {
-                case BashInfo.JS_JGJS://竣工结算
-                    doubles[1]=money;
+                case BashInfo.JS_FBFX:
+                    doubles1[1]=money;
+                    break;
+                case BashInfo.JS_CBRF:
+                    doubles1[2]=money;
+                    break;
+                case BashInfo.JS_CSXM:
+                    doubles1[3]=money;
+                    break;
+                case BashInfo.JS_QTXM:
+                    doubles1[4]=money;
+                    break;
+                case BashInfo.JS_GF:
+                    doubles1[5]=money;
+                    break;
+                case BashInfo.JS_SJ:
+                    doubles1[6]=money;
+                    break;
+                case BashInfo.JS_FBRF:
+                    doubles1[7]=money;
+                    break;
+                case RESON_KYJ:
+                    minus = money;
                     break;
                 case BashInfo.JS_BZZS://补增值税
                     doubles[2]=money;
@@ -541,8 +573,31 @@ public class SettementUtil {
                     break;
             }
         }
+        if (opinion){
+            doubles1[0]=doubles1[1]+doubles1[2]+doubles1[3]+doubles1[4]+doubles1[5]+doubles1[6]-doubles1[7]-minus;
+        }else {
+            doubles1[0]=doubles1[1]+doubles1[2]+doubles1[3]+doubles1[4]+doubles1[5]+doubles1[6]-minus;
+        }
+        doubles[1]=doubles1[0];
         doubles[0]=doubles[1]+doubles[2]-doubles[3];
         return doubles;
+//        for (Settlement settlement:settlements){
+//            name = settlement.getEntryName();
+//            money =settlement.getMoney();
+//            switch (name) {
+//                case BashInfo.JS_JGJS://竣工结算
+//                    doubles[1]=money;
+//                    break;
+//                case BashInfo.JS_BZZS://补增值税
+//                    doubles[2]=money;
+//                    break;
+//                case BashInfo.JS_KJJG://扣减
+//                    doubles[3]=money;
+//                    break;
+//            }
+//        }
+//        doubles[0]=doubles[1]+doubles[2]-doubles[3];
+//        return doubles;
     }
     /**
      * 前台显示提示数据匹配：架空线路
@@ -839,14 +894,19 @@ public class SettementUtil {
             double moneyComparison2=money-5.0;//范围金额-5.0元
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
-                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
-            }
-            if(amout1!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+            if (amout1>=moneyComparison1||amout1<=moneyComparison2){
+                if (amout2>=moneyComparison1||amout2<=moneyComparison2){
+                    reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+                }
+                if(amout2<=moneyComparison1&&amout2>=moneyComparison2){
+                    reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
+                }
+
             }
-            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout1==amout2){
-                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_TRUE;
+            if (amout2>=moneyComparison1||amout2<=moneyComparison2){
+                if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
+                    reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+                }
             }
         }
         return reason;
@@ -877,14 +937,28 @@ public class SettementUtil {
             double amout2 = Double.valueOf(amout[1]);
             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+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
-            }
-            if(money!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
+//                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//            }
+//            if(money!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
+//                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//            }
+//            if (money!=amout1&&amout2<=moneyComparison1&&amout2>=moneyComparison2){
+//                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
+//            }
+            if (amout1>=moneyComparison1||amout1<=moneyComparison2){
+                if (amout2>=moneyComparison1||amout2<=moneyComparison2){
+                    reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+                }
+                if(amout2<=moneyComparison1&&amout2>=moneyComparison2){
+                    reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
+                }
+
             }
-            if (money!=amout1&&amout2<=moneyComparison1&&amout2>=moneyComparison2){
-                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
+            if (amout2>=moneyComparison1||amout2<=moneyComparison2){
+                if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
+                    reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+                }
             }
         }
         return reason;

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

@@ -93,7 +93,7 @@
             <tbody id="mytbody1">
             </tbody>
         </table>
-        <span id="myspan1" style="font-weight: bold;font-size: 15px">【范围内】&nbsp;金额一致</span>
+        <span id="myspan1" style="font-weight: bold;font-size: 15px">验证不通过，请联系维护人员。</span>
         <table class="layui-table" id="hide">
             <colgroup>
             <col width="150">
@@ -111,7 +111,7 @@
             <tbody id="mytbody2">
             </tbody>
         </table>
-        <span id="myspan2" style="font-weight: bold;font-size: 15px"></span>
+        <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">