Merge remote-tracking branch 'origin/master'

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

@@ -303,10 +303,11 @@ public class BashInfo {
     public static List<Settlement> getTotality(Map<String,Object[]> builtMap, double builtTotal, double[] divisiontotal, double wordtotal, double otherTotal, double feescount, String id){
         List<Settlement> list = new ArrayList<Settlement>();
         String key="";
-        double count=0.0;
-        double countProtect=0.0;
-        double creatProtect=0.0;
-        String status="1";
+        double fbr = 0.0;//发包人金额
+        double count=0.0;//1+2+3+4+5+6
+        double countProtect=0.0;//竣工结算+不增值税
+        double creatProtect=0.0;//工程结算数据
+        String status="1";//状态 默认值 0
         Settlement  settlement;
         String reason = BashInfo.JS_REASON;
         for (Map.Entry<String,Object[]> map:builtMap.entrySet()){
@@ -355,20 +356,21 @@ public class BashInfo {
                     }
                     count+=money;
                     break;
+                case BashInfo.JS_SJ:
+                    status="0";
+                    count+=money;
+                    break;
                 case BashInfo.JS_FBRF:
                     if(money==divisiontotal[2]){
                         status="0";
                     }else {
                         reason = BashInfo.RESON_FBRF;
                     }
-                    count+=money;
-                    break;
-                case BashInfo.JS_SJ:
-                    status="0";
-                    count+=money;
+                    fbr=money;
                     break;
                 case BashInfo.JS_JGJS:
-                    if(money==count){
+                    double totalcount = count-fbr;
+                    if(money==totalcount){
                         status="0";
                     }else {
                         reason = BashInfo.RESON_JGJS;