1111

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

@@ -70,17 +70,19 @@ public class OverheadLineController extends BaseController {
     List<JkxlAdjustFee> list2 = feeAdjustService.getTzFee(jkxlAdjustFee);
     //数据校验展示
     List<Settlement> list3 = settlementService.selectSettlementService(id,type);
+    List<Settlement> list4 = disposeData(list,list3);
     HashMap map = new HashMap();
     map.put("list1",list1);
     map.put("list",list);
     map.put("list2",list2);
-    map.put("list3",list3);
+    map.put("list3",list4);
     model.addAttribute("map",map);
     return "modules/sg/free/wbslist";
   }
 
 
 
+
   /**
    *金额分摊调整
    */
@@ -644,26 +646,72 @@ public class OverheadLineController extends BaseController {
 
   }
 
+  private List<Settlement> disposeData(List<JkxlDetailFee> list, List<Settlement> list3) {
+    double originalTotal  = 0.00;
+    double otherCost =0.00;
+    double measuresFee1 =0.00;
+    double fees = 0.00;
+    double tex = 0.00;
+    double totalFee = 0.00;
+    double originalFbrCost = 0.00;
+    double originalCbrCost = 0.00;
+    for (JkxlDetailFee jkxlDetailFee : list){
+      if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000") || jkxlDetailFee.getWbsCode().equals("20000000")){
+           originalTotal  =   jkxlDetailFee.getOriginalTotalCost();  //分部分项合计
+           otherCost = jkxlDetailFee.getOtherCost();     //其他费用
+           measuresFee1 = jkxlDetailFee.getMeasuresFee1();   //措施费
+           fees = jkxlDetailFee.getFees();    //规费
+           tex = jkxlDetailFee.getTex();   //税金
+           totalFee = jkxlDetailFee.getTotalFee();   //合计
+           originalFbrCost = jkxlDetailFee.getOriginalFbrCost();  //发包人合计
+           originalCbrCost = jkxlDetailFee.getOriginalCbrCost();   //承包人合计
+      }
+    }
+    for(Settlement settlement : list3){
+      if(settlement.getEntryName().contains(BashInfo.JS_FBFX)){
+        double ce = 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);
+      }
+      if(settlement.getEntryName().contains("发包人") || settlement.getEntryName().contains("招标人")){
+        double ce = settlement.getMoney() - originalFbrCost;
+        settlement.setTotalFee(originalFbrCost);
+        settlement.setDifference(ce);
+      }
+      if(settlement.getEntryName().contains(BashInfo.JS_CSXM)){
+        double ce = settlement.getMoney() - measuresFee1;
+        settlement.setTotalFee(measuresFee1);
+        settlement.setDifference(ce);
+      }
+      if(settlement.getEntryName().contains(BashInfo.JS_GF)){
+        double ce = settlement.getMoney() - fees;
+        settlement.setTotalFee(fees);
+        settlement.setDifference(ce);
+      }
+      if(settlement.getEntryName().contains(BashInfo.JS_SJ)){
+        double ce = settlement.getMoney() - tex;
+        settlement.setTotalFee(tex);
+        settlement.setDifference(ce);
+      }
+      if(settlement.getEntryName().contains(BashInfo.JS_QTXM)){
+        double ce = settlement.getMoney() - otherCost;
+        settlement.setTotalFee(otherCost);
+        settlement.setDifference(ce);
+      }
+      if(settlement.getEntryName().contains("结算")){
+        double ce = settlement.getMoney() - totalFee;
+        settlement.setTotalFee(totalFee);
+        settlement.setDifference(ce);
+      }
+
 
-  public  List<JkxlDetailFee> formatDouble(List<JkxlDetailFee> list){
-    DecimalFormat decimalFormat = new DecimalFormat("0.00");
-    for(JkxlDetailFee jkxlDetailFee :list){
-      double originalTotal = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00));
-//      double originalRg = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalRgCost()));
-//      double originalFbr = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalFbrCost()));
-//      double originalCbr = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalCbrCost()));
-//      double originalJx = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getOriginalJxCost()));
-//      double zjgcFee = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getZjgcFee()));
-//      double totalFee = Double.parseDouble(decimalFormat.format(jkxlDetailFee.getTotalFee()));
-      jkxlDetailFee.setOriginalTotalCost(originalTotal);
-//      jkxlDetailFee.setOriginalRgCost(originalRg);
-//      jkxlDetailFee.setOriginalFbrCost(originalFbr);
-//      jkxlDetailFee.setOriginalCbrCost(originalCbr);
-//      jkxlDetailFee.setOriginalJxCost(originalJx);
-//      jkxlDetailFee.setZjgcFee(zjgcFee);
-//      jkxlDetailFee.setTotalFee(totalFee);
     }
-    return list;
+    return list3;
   }