Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -70,7 +70,7 @@ public class OverheadLineController extends BaseController {
     List<JkxlAdjustFee> list2 = feeAdjustService.getTzFee(jkxlAdjustFee);
     //数据校验展示
     List<Settlement> list3 = settlementService.selectSettlementService(id,type);
-    List<Settlement> list4 = disposeData(list,list3);
+    List<Settlement> list4 = disposeData(list,list3,list2);
     HashMap map = new HashMap();
     map.put("list1",list1);
     map.put("list",list);
@@ -646,20 +646,26 @@ public class OverheadLineController extends BaseController {
 
   }
 
-  private List<Settlement> disposeData(List<JkxlDetailFee> list, List<Settlement> list3) {
+  private List<Settlement> disposeData(List<JkxlDetailFee> list, List<Settlement> list3,List<JkxlAdjustFee> list2) {
     double originalTotal  = 0.00;
     double otherCost =0.00;
-    double measuresFee1 =0.00;
+    double measuresFee =0.00;
     double fees = 0.00;
     double tex = 0.00;
     double totalFee = 0.00;
     double originalFbrCost = 0.00;
     double originalCbrCost = 0.00;
+    double ce1 = 0.00;
+    for(JkxlAdjustFee jkxlAdjustFee : list2){
+      if(jkxlAdjustFee.getType().equals(BashInfo.CE)){
+        ce1 = jkxlAdjustFee.getFee();
+      }
+    }
     for (JkxlDetailFee jkxlDetailFee : list){
-      if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000") || jkxlDetailFee.getWbsCode().equals("20000000")){
+      if(jkxlDetailFee.getWbsCode().equals("合计") && jkxlDetailFee.getOriginalTotalCost() != null){
            originalTotal  =   jkxlDetailFee.getOriginalTotalCost();  //分部分项合计
            otherCost = jkxlDetailFee.getOtherCost();     //其他费用
-           measuresFee1 = jkxlDetailFee.getMeasuresFee1();   //措施费
+           measuresFee = jkxlDetailFee.getMeasuresFee1()+jkxlDetailFee.getMeasuresFee2()+jkxlDetailFee.getMeasuresFee3();   //措施费
            fees = jkxlDetailFee.getFees();    //规费
            tex = jkxlDetailFee.getTex();   //税金
            totalFee = jkxlDetailFee.getTotalFee();   //合计
@@ -669,44 +675,44 @@ public class OverheadLineController extends BaseController {
     }
     for(Settlement settlement : list3){
       if(settlement.getEntryName().contains(BashInfo.JS_FBFX)){
-        double ce = settlement.getMoney() - originalTotal;
+        double ce = Math.abs(settlement.getMoney() - originalTotal);
         settlement.setTotalFee(originalTotal);
-        settlement.setDifference(ce);
-      }
-      if(settlement.getEntryName().contains("承包人") || settlement.getEntryName().contains("投标人")){
-        double ce = settlement.getMoney() - originalCbrCost;
-        settlement.setTotalFee(originalCbrCost);
-        settlement.setDifference(ce);
+        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
+//      if(settlement.getEntryName().contains("承包人") || settlement.getEntryName().contains("投标人")){
+//        double ce = Math.abs(settlement.getMoney() - originalCbrCost);
+//        settlement.setTotalFee(originalCbrCost);
+//        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+//      }
       if(settlement.getEntryName().contains("发包人") || settlement.getEntryName().contains("招标人")){
-        double ce = settlement.getMoney() - originalFbrCost;
+        double ce = Math.abs(settlement.getMoney() - originalFbrCost);
         settlement.setTotalFee(originalFbrCost);
-        settlement.setDifference(ce);
+        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
       if(settlement.getEntryName().contains(BashInfo.JS_CSXM)){
-        double ce = settlement.getMoney() - measuresFee1;
-        settlement.setTotalFee(measuresFee1);
-        settlement.setDifference(ce);
+        double ce = Math.abs(settlement.getMoney() - measuresFee);
+        settlement.setTotalFee(measuresFee);
+        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
       if(settlement.getEntryName().contains(BashInfo.JS_GF)){
-        double ce = settlement.getMoney() - fees;
+        double ce = Math.abs(settlement.getMoney() - fees);
         settlement.setTotalFee(fees);
-        settlement.setDifference(ce);
+        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
       if(settlement.getEntryName().contains(BashInfo.JS_SJ)){
-        double ce = settlement.getMoney() - tex;
+        double ce = Math.abs(settlement.getMoney() - tex);
         settlement.setTotalFee(tex);
-        settlement.setDifference(ce);
+        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
       if(settlement.getEntryName().contains(BashInfo.JS_QTXM)){
-        double ce = settlement.getMoney() - otherCost;
+        double ce = Math.abs(settlement.getMoney() - otherCost);
         settlement.setTotalFee(otherCost);
-        settlement.setDifference(ce);
+        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
-      if(settlement.getEntryName().contains("结算")){
-        double ce = settlement.getMoney() - totalFee;
+      if(settlement.getEntryName().contains("结算") || settlement.getEntryName().contains("报价")){
+//        double ce = Math.abs(settlement.getMoney() - totalFee);
         settlement.setTotalFee(totalFee);
-        settlement.setDifference(ce);
+        settlement.setDifference(new BigDecimal(ce1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
 
 

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -188,7 +188,9 @@ public class SubstationService {
             //建筑部门求和
             JkxlDetailFee jzDetail = jzTotal.get(0);
             double jztotalFee =  jzDetail.getTotalFee()+tbrJzFee*(1+texRate);
+            double jztex =  jzDetail.getTex()+tbrJzFee*texRate;
             jzDetail.setTotalFee(jztotalFee);
+            jzDetail.setTex(jztex);
             jzTotal.set(0,jzDetail);
             //安装部分基础数据
             JkxlDetailFee az = SubstationInfo.getTolalInfo(azqd,azhz,"23000000",SubstationInfo.AZMX_BDZAZ);  //安装合计
@@ -251,6 +253,7 @@ public class SubstationService {
             azDetail.setTotalFee(aztotalFee);
             azTotal.set(0,azDetail);
 
+
             double tz = jzTotal.get(0).getTotalFee()+azTotal.get(0).getTotalFee();//总合计金额
             double gxFee = Math.abs(gcjsFee-tz-qtFees[0]-qtFees[1]);
             //将其他费用存入集合

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -289,8 +289,8 @@ function sureradio2(data,url){
                     "settext":"${data.remarks}",
                     "status":"${data.status}",
                     "reason":"${data.reason}",
-                    "jshj":"${data.totalFee}",
-                    "ce":"${data.difference}"
+                    "jshj":doIt(${data.totalFee}),
+                    "ce":doIt(${data.difference})
                 },
             </c:forEach>
         </c:if>