瀏覽代碼

qweqweqweq

xs 5 年之前
父節點
當前提交
ae55629316
共有 1 個文件被更改,包括 10 次插入6 次删除
  1. 10 6
      src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

+ 10 - 6
src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -564,8 +564,8 @@ public class SettementUtil {
             settlement.setStatus("1");
             switch (name){
                 case BashInfo.JS_FBFX:
-                    double division=divisiontotal[0]+divisiontotal[2];
-                    double built = builtTotal[0]+builtTotal[1];
+                    double division=divisiontotal[0]+divisiontotal[2];//分工清单分部分项
+                    double built = builtTotal[0]+builtTotal[1];//安装合计总金额
                     if (money==built&&money==division){
                         settlement.setStatus("0");
                     }
@@ -712,16 +712,20 @@ public class SettementUtil {
             double money = settlement.getMoney();
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            if(money!=amout1&&amout1!=amout2){
+            if(money!=amout1&&money!=amout2){
                 reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_FLASE;
             }
-            if(amout1!=amout2&&money==amout1){
+            if(money!=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;
+            if (money!=amout1&&money==amout2){
+                reason=reason1+"<br>"+SettementUtil.RESON_FLASE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
             }
         }
+
+
+
+
         return reason;
     }
     /*