蔡德晨 5 år sedan
förälder
incheckning
7dd96a604e

+ 8 - 0
src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -164,6 +164,7 @@ public class OverheadLineService {
        settlementService.save(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,id);
       //获取补增值税税率调整差额和扣减甲供材超供材料费
        double[] wsbFees = ExcelUtil.getDoubleArray(total, new String[]{BashInfo.BZZSSL,BashInfo.KJJGCC},1,2);
+       double csFee = ExcelUtil.getDouble(gzhz,BashInfo.HZ_CH,1,2);
        double[] originalTotalFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,2); //获取合计费
        double[] zjgcFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,3);  //获取直接工程费
        double[][] originalFees = ExcelUtil.getDoubleArrays(importExcel,BashInfo.MX_ALL,2, new int[]{13, 14, 15, 17}); //获取原始费用
@@ -285,6 +286,13 @@ public class OverheadLineService {
        jkxlAdjustFee2.setType(BashInfo.CE);
        jkxlAdjustFee2.setFee(gxFee);
        feeAdjustService.save(jkxlAdjustFee2);
+       if(csFee!= 0.00){
+           JkxlAdjustFee jkxlAdjustFee3 = new JkxlAdjustFee();
+           jkxlAdjustFee3.setId(id);
+           jkxlAdjustFee3.setType(BashInfo.HZ_CH);
+           jkxlAdjustFee3.setFee(csFee);
+           feeAdjustService.save(jkxlAdjustFee3);
+       }
    }
 
 

+ 2 - 0
src/main/java/com/jeeplus/modules/sg/overheadline/util/BashInfo.java

@@ -51,6 +51,8 @@ public class BashInfo {
     public static final String HZ_JXGC = "架线工程";
     public static final String HZ_FJAZGC = "附件安装工程";
     public static final String HZ_FZ = "辅助工程";
+    public static final String HZ_CH = "措施项目";
+
 
     public static final String TZ_RGF = "人工费";
     public static final String TZ_CBRCG = "承包分采购";