分部分项修改

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

@@ -17,8 +17,8 @@ import java.util.List;
 public class SettementUtil {
     private static final NumberFormat nf= NumberFormat.getInstance();
     public static Boolean getFlag = false;
-    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 RESON_TRUE="金额<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="投标报价";
@@ -985,24 +985,33 @@ public class SettementUtil {
         }
         if(status.equals("1")){//如果为“1”，金额不一致 进行判断  哪些金额一致/不一致
             double money = settlement.getMoney();
-            double moneyComparison1=money;//范围金额+5.0元
-            double moneyComparison2=money;//范围金额-5.0元
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            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 (amout2>=moneyComparison1||amout2<=moneyComparison2){
-                if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                    reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
-                }
-            }
+            //分部分项金额全都不一致情况(两种都比情况)
+            if(amout1!=money&&amout2!=money){
+                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+            }
+            if (amout1 == money && amout2 != money){
+                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+            }
+            if (amout1!=money && amout2 == money){
+                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 (amout2>=moneyComparison1||amout2<=moneyComparison2){
+//                if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
+//                    reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//                }
+//            }
         }
         return reason; //最终分部分项提示信息
     }
@@ -1031,23 +1040,31 @@ public class SettementUtil {
             double money = settlement.getMoney();
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            double moneyComparison1=money;//范围金额+5.0元
-            double moneyComparison2=money;//范围金额-5.0元
-            //判断 不一致 地方 拼接不同常量
-            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 (amout2>=moneyComparison1||amout2<=moneyComparison2){
-                if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                    reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
-                }
-            }
+            //判断不一致情况
+            if(amout1!=money&&amout2!=money){
+                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+            }
+            if (amout1 == money && amout2 != money){
+                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+            }
+            if (amout1!=money && amout2 == money){
+                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 (amout2>=moneyComparison1||amout2<=moneyComparison2){
+//                if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
+//                    reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//                }
+//            }
         }
         return reason;
     }