验证规则修改

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

@@ -278,8 +278,6 @@ public class SettementUtil {
         String name="";//获取当前汇总表名称
         double money=0.0;//获取当前汇总表金额
         Settlement settlement;//对象
-        double moneyComparison1;//范围金额+5.0元
-        double moneyComparison2;//范围金额-5.0元
         for (int i = 0; i < settlements.size(); i++) {
             settlement=settlements.get(i);
             name=settlement.getEntryName();
@@ -312,41 +310,39 @@ public class SettementUtil {
                 name = BashInfo.JS_GCJS;
             }
             money=settlement.getMoney();//获取对象金额
-            moneyComparison1 = money+5.0;//取值范围
-            moneyComparison2 = money-5.0;
             settlement.setStatus("1");
             switch (name){
                 case BashInfo.JS_FBFX://如果存在分部分项费
                     //builtTotal 架空线路工程费用汇总表 分部分项 合计 divisiontotal[0] 获取分部分项比对数据清单 分部分项费用
                     //判断
-                    if(builtTotal<=moneyComparison1&&builtTotal>=moneyComparison2&&divisiontotal[0]<=moneyComparison1&&divisiontotal[0]>=moneyComparison2){
+                    if(builtTotal==money&&divisiontotal[0]==money){
                         settlement.setStatus("0");//一致
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(builtTotal)+","+nf.format(divisiontotal[0])));//存入数据库
                     break;
                 case  BashInfo.JS_CBRF://如果存在承包人采购设备费
                     //cbperson 获取承包人采购表合计
-                    if(cbperson<=moneyComparison1&&cbperson>=moneyComparison2){
+                    if(cbperson==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
                     break;
                 case BashInfo.JS_CSXM://如果存在措施项目费
                     //wordtotal 措施费（1），措施费(2)金额相加
-                    if(wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
+                    if(wordtotal==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(wordtotal1)+","+nf.format(wordtotal2)+","+nf.format(wordtotal)));
                     break;
                 case BashInfo.JS_QTXM://如果存在其他项目费
                     //otherTotal 其他项目费合计
-                    if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
+                    if(otherTotal==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(otherTotal)));
                     break;
                 case BashInfo.JS_GF://如果存在规费
-                    if (feescount<=moneyComparison1&&feescount>=moneyComparison2){
+                    if (feescount==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(feescount)));
@@ -356,14 +352,14 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(nf.format(money)));
                     break;
                 case BashInfo.JS_FBRF: //如果存在发包人费
-                    if(divisiontotal[1]<=moneyComparison1&&divisiontotal[1]>=moneyComparison2){
+                    if(divisiontotal[1]==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisiontotal[1])));
                     break;
                 case BashInfo.JS_JGJS://如果存在竣工结算价
                     double doubles = getJgjsComparison(settlements);//获取与竣工结算价比对的金额 doubles为比对金额
-                    if (doubles<=moneyComparison1&&doubles>=moneyComparison2){
+                    if (doubles==money){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles));
@@ -372,7 +368,7 @@ public class SettementUtil {
                 case BashInfo.JS_GCJS: //如果存在工程结算价
                     //gcComparison 工程结算价 比对金额
                     double gcComparison =getGcComparison(settlements);
-                    if (gcComparison<=moneyComparison1&&gcComparison>=moneyComparison2){
+                    if (gcComparison==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(gcComparison)));
@@ -402,8 +398,6 @@ public class SettementUtil {
         String name="";//获取当前汇总表名称
         double money=0.0;//获取当前汇总表金额
         Settlement settlement;//对象
-        double moneyComparison1;//范围金额+5.0元
-        double moneyComparison2;//范围金额-5.0元
         for (int i = 0; i < settlements.size(); i++) {
             settlement=settlements.get(i);
             name=settlement.getEntryName();
@@ -437,8 +431,6 @@ public class SettementUtil {
             }
             //获取金额
             money=settlement.getMoney();
-            moneyComparison1 = money+5.0;
-            moneyComparison2 = money-5.0;
             //默认初始状态为 1-不一致
             settlement.setStatus("1");
             switch (name){
@@ -446,7 +438,7 @@ public class SettementUtil {
                     double division=divisiontotal[0]+divisiontotal[2];//分工清单分部分项
                     double built = builtTotal[0]+builtTotal[1];//安装合计总金额
                     //比对是否在范围内
-                    if(built<=moneyComparison1&&built>=moneyComparison2&&division<=moneyComparison1&&division>=moneyComparison2){
+                    if(built==money&&division==money){
                         settlement.setStatus("0"); //比对结果 一致
                     }
                     //存放字符串 用“,”隔开
@@ -454,7 +446,7 @@ public class SettementUtil {
                     break;
                 case  BashInfo.JS_CBRF://承包人采购设备费
                     //cbperson  发包人/招标人 费用
-                    if(cbperson<=moneyComparison1&&cbperson>=moneyComparison2){
+                    if(cbperson==money){
                         settlement.setStatus("0");//比对结果 一致
                     }
                     //存放字符串 用“,”隔开
@@ -462,7 +454,7 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_CSXM://措施项目费
                     //wordtotal 措施表1,2相加
-                    if (wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
+                    if (wordtotal==money){
                         settlement.setStatus("0");//比对结果 一致
                     }
                     //存放字符串 用“,”隔开
@@ -470,14 +462,14 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_QTXM://其他项目费
                     //otherTotal 其他费比对金额
-                    if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
+                    if(otherTotal==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(otherTotal)));
                     break;
                 case BashInfo.JS_GF://规费
                     //feescount 规费表等到合计金额
-                    if (feescount<=moneyComparison1&&feescount>=moneyComparison2){
+                    if (feescount==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(feescount)));
@@ -488,14 +480,14 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_FBRF://发包人采购材料费
                     double divisionFbr =divisiontotal[1]+divisiontotal[3];//发包人比对金额相加
-                    if(divisionFbr<=moneyComparison1&&divisionFbr>=moneyComparison2){
+                    if(divisionFbr==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisionFbr)+","+nf.format(divisiontotal[1])+","+nf.format(divisiontotal[3])));
                     break;
                 case BashInfo.JS_JGJS://竣工结算价合计
                     double doubles = getJgjsComparison(settlements);//获取比对金额
-                    if (doubles<=moneyComparison1&&doubles>=moneyComparison2){
+                    if (doubles==money){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles));
@@ -504,7 +496,7 @@ public class SettementUtil {
                 case BashInfo.JS_GCJS://工程结算价
                     double gcComparison =getGcComparison(settlements);//获取比对金额
                     //验证 金额 误差是否在范围内
-                    if (gcComparison<=moneyComparison1&&gcComparison>=moneyComparison2){
+                    if (gcComparison==money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(gcComparison)));