20190805提交

src/main/java/com/jeeplus/modules/sg/overheadline/service/SettlementService.java

@@ -246,12 +246,12 @@ public class SettlementService {
     public 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;
+        double count=0.0;
+        double countProtect=0.0;
+        double creatProtect=0.0;
         String status="1";
         Settlement  settlement;
-        String reason = "数据核验正确";
+        String reason = BashInfo.JS_REASON;
         for (Map.Entry<String,Object[]> map:builtMap.entrySet()){
             key = map.getKey();
             Object[] val = map.getValue();
@@ -261,50 +261,50 @@ public class SettlementService {
                 case BashInfo.JS_FBFX:
                     if(money==builtTotal&&money==divisiontotal[0]){
                         status="0";
-                        count+=money;
                     }else {
                         reason = BashInfo.RESON_FBFX;
                     }
+                    count+=money;
                     break;
                 case  BashInfo.JS_CBRF:
                     if(money==divisiontotal[1]){
                         status="0";
-                        count+=money;
                     }else {
                         reason = BashInfo.RESON_CBRF;
                     }
+                    count+=money;
                     break;
                 case BashInfo.JS_CSXM:
                     if(money==wordtotal){
                         status="0";
-                        count+=money;
                     }else {
                         reason = BashInfo.RESON_CSXM;
                     }
+                    count+=money;
                     break;
                 case BashInfo.JS_QTXM:
-                    if(money==wordtotal){
+                    if(money==otherTotal){
                         status="0";
-                        count+=money;
                     }else {
                         reason = BashInfo.RESON_QTXM;
                     }
+                    count+=money;
                     break;
                 case BashInfo.JS_GF:
                     if(money==feescount){
                         status="0";
-                        count+=money;
                     }else {
                         reason = BashInfo.RESON_GF;
                     }
+                    count+=money;
                     break;
                 case BashInfo.JS_FBRF:
                     if(money==divisiontotal[2]){
                         status="0";
-                        count+=money;
                     }else {
                         reason = BashInfo.RESON_FBRF;
                     }
+                    count+=money;
                     break;
                 case BashInfo.JS_SJ:
                     status="0";
@@ -313,10 +313,10 @@ public class SettlementService {
                 case BashInfo.JS_JGJS:
                     if(money==count){
                         status="0";
-                        countProtect+=money;
                     }else {
                         reason = BashInfo.RESON_JGJS;
                     }
+                    countProtect+=money;
                     break;
                 case BashInfo.JS_BZZS:
                     status="0";
@@ -331,7 +331,7 @@ public class SettlementService {
                     if (money==reduce){
                         status="0";
                     }else {
-                        reason = BashInfo.RESON_GCJS;
+                        reason = BashInfo.JS_REASON;
                     }
                     break;
             }

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

@@ -66,18 +66,20 @@ public class BashInfo {
     public static final String JS_BZZS="补增值税税率调整差额";
     public static final String JS_KJJG="扣减甲供材超供材料费";
     public static final String JS_GCJS="工程结算价";
-
-    public static final String RESON_FBFX="分部分项工程费";
-    public static final String RESON_CBRF="承包人采购设备费";
-    public static final String RESON_CSXM="措施项目费";
-    public static final String RESON_QTXM="其他项目费";
-    public static final String RESON_GF="规费";
-    public static final String RESON_SJ="税金 (税率: 9%)";
-    public static final String RESON_FBRF="发包人采购材料费";
-    public static final String RESON_JGJS="竣工结算价合计";
+    public static final String JS_REASON="数据核验正确";
+
+    public static final String RESON_FBFX="《工程项目竣工结算汇总表》中分部分项金额与《架空线路工程费用汇总表》中分部分项单项合计金额/《分布分项工程量清单计价表》中分布分项单项金额不一致";
+    public static final String RESON_CBRF="《工程项目竣工结算汇总表》中承包人采购设备费与《分布分项工程量清单计价表》中'架空线路'合价承包人采购不一致";
+    public static final String RESON_CSXM="《工程项目竣工结算汇总表》中措施项目费与《措施项目清单计价表一》的合计+《措施项目清单计价表二》的合计不一致";
+    public static final String RESON_QTXM="《工程项目竣工结算汇总表》中其他项目费与《其他项目清单计价表》的合计费用不一致";
+    public static final String RESON_GF="《工程项目竣工结算汇总表》中规费与《规费项目清单计价表》合计不一致";
+    public static final String RESON_SJ="《工程项目竣工结算汇总表》中税金 (税率: 9%)";
+    public static final String RESON_FBRF="《工程项目竣工结算汇总表》中发包人采购材料费与《分布分项工程量清单计价表》中'架空线路'合价发包人采购不一致";
+    public static final String RESON_JGJS="《工程项目竣工结算汇总表》中竣工结算价合计金额不一致";
     public static final String RESON_BZZS="补增值税税率调整差额";
     public static final String RESON_KJJG="扣减甲供材超供材料费";
-    public static final String RESON_GCJS="工程结算价";
+    public static final String RESON_GCJS="《工程项目竣工结算汇总表》中工程结算价不一致";
+