1111

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

@@ -157,37 +157,37 @@ public class OverheadLineService {
            jkxlDetailFee.setId(id);
            list.add(jkxlDetailFee);
        }
-       //分摊费用到合计
-       double tz = 0.00;
+       double tz = 0.00; //总合计金额
        for(JkxlDetailFee jkxlDetailFee : list){
            tz += jkxlDetailFee.getTotalFee();
        }
-       if(gcjsFee>tz){
-           double gxFee = gcjsFee-tz-qtFees[0]-qtFees[1]-wsbFees[0]-wsbFees[1];
-           double rate1 = 0.00;
-           double gxFee1 = 0.00;
-           double totalF = 0.00;
-           for(JkxlDetailFee jkxlDetailFee : list){
-               rate1 = jkxlDetailFee.getTotalFee()/tz;
-               gxFee1 = gxFee*rate1;
-               totalF = gxFee1 + jkxlDetailFee.getTotalFee();
-               jkxlDetailFee.setGxFee(Math.abs(gxFee1));
-               jkxlDetailFee.setTotalFee(totalF);
-           }
-       }else {
-           double gxFee = tz+qtFees[0]+qtFees[1]+wsbFees[0]+wsbFees[1]-gcjsFee;
-           double rate1 = 0.00;
-           double gxFee1 = 0.00;
-           double totalF = 0.00;
-           for(JkxlDetailFee jkxlDetailFee : list){
-               rate1 = jkxlDetailFee.getTotalFee()/tz;
-               gxFee1 = gxFee*rate1;
-               totalF = jkxlDetailFee.getTotalFee()-gxFee1;
-               jkxlDetailFee.setGxFee(Math.abs(gxFee1));
-               jkxlDetailFee.setTotalFee(totalF);
-           }
-
-       }
+       double gxFee = Math.abs(gcjsFee-tz-qtFees[0]-qtFees[1]-wsbFees[0]-wsbFees[1]);
+//       if(gcjsFee>tz){
+//           double gxFee = gcjsFee-tz-qtFees[0]-qtFees[1]-wsbFees[0]-wsbFees[1];
+//           double rate1 = 0.00;
+//           double gxFee1 = 0.00;
+//           double totalF = 0.00;
+//           for(JkxlDetailFee jkxlDetailFee : list){
+//               rate1 = jkxlDetailFee.getTotalFee()/tz;
+//               gxFee1 = gxFee*rate1;
+//               totalF = gxFee1 + jkxlDetailFee.getTotalFee();
+//               jkxlDetailFee.setGxFee(Math.abs(gxFee1));
+//               jkxlDetailFee.setTotalFee(totalF);
+//           }
+//       }else {
+//           double gxFee = tz+qtFees[0]+qtFees[1]+wsbFees[0]+wsbFees[1]-gcjsFee;
+//           double rate1 = 0.00;
+//           double gxFee1 = 0.00;
+//           double totalF = 0.00;
+//           for(JkxlDetailFee jkxlDetailFee : list){
+//               rate1 = jkxlDetailFee.getTotalFee()/tz;
+//               gxFee1 = gxFee*rate1;
+//               totalF = jkxlDetailFee.getTotalFee()-gxFee1;
+//               jkxlDetailFee.setGxFee(Math.abs(gxFee1));
+//               jkxlDetailFee.setTotalFee(totalF);
+//           }
+//
+//       }
        //将其他费用存入集合
        JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
        JkxlDetailFee jkxlDetailFee2 = new JkxlDetailFee();
@@ -214,6 +214,11 @@ public class OverheadLineService {
        jkxlAdjustFee1.setType(BashInfo.KJJGCC);
        jkxlAdjustFee1.setFee(wsbFees[1]);
        feeAdjustService.save(jkxlAdjustFee1);
+       JkxlAdjustFee jkxlAdjustFee2 = new JkxlAdjustFee();
+       jkxlAdjustFee2.setId(id);
+       jkxlAdjustFee2.setType(BashInfo.CE);
+       jkxlAdjustFee2.setFee(gxFee);
+       feeAdjustService.save(jkxlAdjustFee2);
    }
 
 

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

@@ -68,8 +68,8 @@ public class SettlementService {
         for (int i = 2; i < lastDataRowNum; i++) {
             objects = new Object[2];
             key =  importExcel.getValue(i+1,1);
-            val = importExcel.getDouble(i+1,2);
-            text=importExcel.getValue(i+1,3);
+//            val = importExcel.getDouble(i+1,2);
+//            text=importExcel.getValue(i+1,3);
             switch (key){
                 case BashInfo.JS_FBFX:
                     val = importExcel.getDouble(i+1,2);

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

@@ -36,6 +36,7 @@ public class BashInfo {
     public static final String GCJS = "工程结算价";
     public static final String TBJG = "竣工结算价合计";
     public static final String TBJG1 = "投标报价";
+    public static final String CE = "差额";
 
     public static final String HZ_JCGC = "基础工程";
     public static final String HZ_GTGC = "杆塔工程";

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

@@ -498,7 +498,7 @@ public class OverheadLineController extends BaseController {
       zFee[17] += jkxlDetailFee.getOtherCost();
       zFee[18] += jkxlDetailFee.getFees();
       zFee[19] += jkxlDetailFee.getTex();
-      zFee[20] += jkxlDetailFee.getGxFee();
+//      zFee[20] += jkxlDetailFee.getGxFee();
       zFee[21] += jkxlDetailFee.getTotalFee();
     }
     JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -523,7 +523,7 @@ public class OverheadLineController extends BaseController {
     jkxlDetailFee.setOtherCost(new BigDecimal(zFee[17]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setFees(new BigDecimal(zFee[18]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setTex(new BigDecimal(zFee[19]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setGxFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+//    jkxlDetailFee.setGxFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setTotalFee(new BigDecimal(zFee[21]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setWbsCode("合计");
     jkxlDetailFee.setParentNode("30000000");

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

@@ -118,7 +118,7 @@
                     {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
                     {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
                     {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
-                    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'11'},
+                    {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
 
                     {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
 //                  {templet: '#oper-col', title: 'oper'}
@@ -146,7 +146,7 @@
                     {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:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
+                    // {field:'gxfy',align:'center',width:120,title: '共性费用',rowspan:'2',totalRow: true},
                 ]]
                 ,data: [
                 <c:if test="${ not empty map.list}">
@@ -402,7 +402,7 @@
                 </c:forEach>
                 </c:if>
             ]
-            ,page: false
+            // ,page: false
         });
         //监听行工具事件
         table.on('tool(settle)', function(obj){