Merge remote-tracking branch 'origin/master'

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

@@ -108,8 +108,22 @@ public class OverheadLineController extends BaseController {
         double size = jkxlDetailFees.size();
         //直接工程费
         if(code.equals(BashInfo.TZ_ZJGC)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getZjgcFee();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getZjgcFee();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getZjgcFee();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getZjgcFee();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -123,6 +137,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -135,8 +150,22 @@ public class OverheadLineController extends BaseController {
         }
         //人工费
         if(code.equals(BashInfo.TZ_RGF)){
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-                total += jkxlDetailFee.getOriginalRgCost();
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getOriginalRgCost();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getOriginalRgCost();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getOriginalRgCost();
+            }
           }
             for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
               JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -150,6 +179,7 @@ public class OverheadLineController extends BaseController {
                 rate = rgFee/total;
               }
               double ftFee = rate*fee;
+              jkxlDetailFee.setRgFtFee(ftFee);
               if(state.equals("1")){
                 double zFee = totalFee+ftFee;
                 jkxlDetailFee.setTotalFee(zFee);
@@ -162,8 +192,22 @@ public class OverheadLineController extends BaseController {
         }
         //承包人采购
         if(code.equals(BashInfo.TZ_CBRCG)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getOriginalCbrCost();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getOriginalCbrCost();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getOriginalCbrCost();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getOriginalCbrCost();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -177,6 +221,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -189,8 +234,22 @@ public class OverheadLineController extends BaseController {
         }
         //发包人采购
         if(code.equals(BashInfo.TZ_FBRCG)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getOriginalFbrCost();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getOriginalFbrCost();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getOriginalFbrCost();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getOriginalFbrCost();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -204,6 +263,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -216,8 +276,22 @@ public class OverheadLineController extends BaseController {
         }
         //机械费
         if(code.equals(BashInfo.TZ_JX)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getOriginalJxCost();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getOriginalJxCost();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getOriginalJxCost();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getOriginalJxCost();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -231,6 +305,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -243,8 +318,22 @@ public class OverheadLineController extends BaseController {
         }
         //措施费一（1）
         if(code.equals(BashInfo.TZ_CSF1)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getMeasuresFee1();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getMeasuresFee1();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getMeasuresFee1();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getMeasuresFee1();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -258,6 +347,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -270,8 +360,22 @@ public class OverheadLineController extends BaseController {
         }
         //措施费一（2）
         if(code.equals(BashInfo.TZ_CSF2)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getMeasuresFee2();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getMeasuresFee2();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getMeasuresFee2();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getMeasuresFee2();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -285,6 +389,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -297,8 +402,22 @@ public class OverheadLineController extends BaseController {
         }
         //措施费二
         if(code.equals(BashInfo.TZ_CSF3)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getMeasuresFee3();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getMeasuresFee3();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getMeasuresFee3();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getMeasuresFee3();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -312,6 +431,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -324,8 +444,22 @@ public class OverheadLineController extends BaseController {
         }
         //其他费
         if(code.equals(BashInfo.TZ_QTF)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getOtherCost();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getOtherCost();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getOtherCost();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getOtherCost();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -339,6 +473,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -351,8 +486,22 @@ public class OverheadLineController extends BaseController {
         }
         //规费
         if(code.equals(BashInfo.TZ_GF)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getFees();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getFees();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getFees();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getFees();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -366,6 +515,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);
@@ -378,8 +528,22 @@ public class OverheadLineController extends BaseController {
         }
         //税费
         if(code.equals(BashInfo.TZ_SF)){
-          for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
-            total += jkxlDetailFee.getTex();
+          if(itemType.equals("3")){
+            double totalJz = 0.00;
+            double totalAz = 0.00;
+            for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              if(jkxlDetailFee.getWbsCode().equals("21000000")){
+                totalJz = jkxlDetailFee.getTex();
+              }
+              if(jkxlDetailFee.getWbsCode().equals("23000000")){
+                totalAz = jkxlDetailFee.getTex();
+              }
+              total = totalAz + totalJz;
+            }
+          }else {
+            for (JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
+              total += jkxlDetailFee.getTex();
+            }
           }
           for(JkxlDetailFee jkxlDetailFee1 : jkxlDetailFees){
             JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -393,6 +557,7 @@ public class OverheadLineController extends BaseController {
               rate = rgFee/total;
             }
             double ftFee = rate*fee;
+            jkxlDetailFee.setRgFtFee(ftFee);
             if(state.equals("1")){
               double zFee = totalFee+ftFee;
               jkxlDetailFee.setTotalFee(zFee);

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

@@ -26,28 +26,29 @@ layui.config({
     {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
 
     {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码"},
-    {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
-    {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
-    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
+    {field:'fbfxysj', align:'center', title: '分部分项',colspan:'7'},
+    //{field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
+    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'7'},
 
     {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
     ],[
     {field:'hjje', width:120,align:'center',title:'合计金额',totalRow: true},
     {field:'zjgcf', width:120,align:'center',title:'直接工程费',totalRow: true},
     {field:'rgf1', width:120,align:'center',title:'人工费',totalRow: true},
+    {field:'rgf2', width:120,align:'center',title:'人工费(调差后)',totalRow: true},
     {field:'cbrcg1', width:120,align:'center',title:'承包人采购',totalRow: true},
     {field:'fbrcg1', width:120,align:'center',title:'发包人采购',totalRow: true},
     {field:'jxf1', width:120,align:'center',title:'机械费',totalRow: true},
 
-    {field:'rgf2', width:120,align:'center',title:'人工费',totalRow: true},
-    {field:'cbrcg2', width:120,align:'center',title:'承包人采购',totalRow: true},
-    {field:'fbrcg2', width:120,align:'center',title:'发包人采购',totalRow: true},
-    {field:'jxf2', width:120,align:'center',title:'机械费',totalRow: true},
+    //{field:'rgf2', width:120,align:'center',title:'人工费',totalRow: true},
+    //{field:'cbrcg2', width:120,align:'center',title:'承包人采购',totalRow: true},
+    //{field:'fbrcg2', width:120,align:'center',title:'发包人采购',totalRow: true},
+    //{field:'jxf2', width:120,align:'center',title:'机械费',totalRow: true},
 
-    {field:'rgf3', width:120,align:'center',title:'人工费',totalRow: true},
-    {field:'cbrcg3', width:120,align:'center',title:'承包人采购',totalRow: true},
-    {field:'fbrcg3', width:120,align:'center',title:'发包人采购',totalRow: true},
-    {field:'jxf3', width:120,align:'center',title:'机械费',totalRow: true},
+    //{field:'rgf3', width:120,align:'center',title:'人工费',totalRow: true},
+    //{field:'cbrcg3', width:120,align:'center',title:'承包人采购',totalRow: true},
+    //{field:'fbrcg3', width:120,align:'center',title:'发包人采购',totalRow: true},
+    //{field:'jxf3', width:120,align:'center',title:'机械费',totalRow: true},
 
     {field:'csf_1',width:120,title:'措施费-1',align:'center',totalRow: true},
     {field:'csf_2',width:120,title:'措施费-2',align:'center',totalRow: true},
@@ -55,6 +56,7 @@ layui.config({
     {field:'qtf',align:'center',width:120,title:'其他费',totalRow: true},
     {field:'gf',align:'center',width:120,title:'规费',totalRow: true},
     {field:'sf',align:'center',width:120,title:'税金',totalRow: true},
+    {field:'rgf3',align:'center',width:120,title:'分摊费用',totalRow: true},
     ]]
     ,data: [ //数据传入
     <c:if test="${ not empty map.list}">