Merge remote-tracking branch 'origin/master'

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

@@ -293,6 +293,7 @@ public List<JkxlDetailFee> findList(String id,String type){
         //获取结算表中基础数据
         double jsCs = ExcelUtil.getDouble(total,BashInfo.JS_CSXM,1,2);
         double jsGf = ExcelUtil.getDouble(total,BashInfo.JS_GF,1,2);
+        double textotal = ExcelUtil.getTex(total);
        //将本体工程费用明细存入集合
        List<JkxlDetailFee> list = new ArrayList<>();
        for(int i=0;i<originalTotalFees.length;i++){
@@ -406,6 +407,20 @@ public List<JkxlDetailFee> findList(String id,String type){
            jkxlDetailFee1.setTex(jkxlDetailFee1.getTex()+sgft);
            jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft+sgft);
         }
+        //分摊税
+        double texh = textotal+btex;//总税额
+        double jktex = 0.00;
+        for(JkxlDetailFee jkxlDetailFee : list){
+            jktex += jkxlDetailFee.getTex();
+        }
+        double texr = texh-jktex;
+        for(JkxlDetailFee jkxlDetailFee : list){
+            double texrate = jkxlDetailFee.getTex()/jktex;
+            double tex = texr*texrate;
+            jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+            jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
+
+        }
         //计算差额
         for(JkxlDetailFee jkxlDetailFee : list){
             tz += jkxlDetailFee.getTotalFee();
@@ -519,6 +534,7 @@ public List<JkxlDetailFee> findList(String id,String type){
         //获取结算表中基础数据
         double jsCs = ExcelUtil.getDouble(total,BashInfo.JS_CSXM,1,2);
         double jsGf = ExcelUtil.getDouble(total,BashInfo.JS_GF,1,2);
+        double textotal = ExcelUtil.getTex(total);
         List<JkxlDetailFee> list = new ArrayList<>();
         if(jzgc !=0.00 && azgc == 0.00){
             ImportExcel jzqd = new ImportExcel(file,1,BashInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
@@ -854,6 +870,20 @@ public List<JkxlDetailFee> findList(String id,String type){
             jkxlDetailFee1.setTex(jkxlDetailFee1.getTex()+sgft);
             jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft);
         }
+        //分摊税
+        double texh = textotal+btex;//总税额
+        double jktex = 0.00;
+        for(JkxlDetailFee jkxlDetailFee : list){
+            jktex += jkxlDetailFee.getTex();
+        }
+        double texr = texh-jktex;
+        for(JkxlDetailFee jkxlDetailFee : list){
+            double texrate = jkxlDetailFee.getTex()/jktex;
+            double tex = texr*texrate;
+            jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+            jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
+
+        }
         //计算差额
         for(JkxlDetailFee jkxlDetailFee : list){
             tz += jkxlDetailFee.getTotalFee();
@@ -956,7 +986,7 @@ public List<JkxlDetailFee> findList(String id,String type){
         //获取结算表中基础数据
         double jsCs = ExcelUtil.getDouble(total,BashInfo.JS_CSXM,1,2);
         double jsGf = ExcelUtil.getDouble(total,BashInfo.JS_GF,1,2);
-//        double jsTex = ExcelUtil.getTex(total);
+        double textotal = ExcelUtil.getTex(total);
         List<JkxlDetailFee> list = new ArrayList<>();
         if(jzgc !=0.00 && azgc == 0.00){
             ImportExcel jzqd = new ImportExcel(file,1,BashInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
@@ -1291,6 +1321,20 @@ public List<JkxlDetailFee> findList(String id,String type){
             jkxlDetailFee1.setTex(jkxlDetailFee1.getTex()+sgft);
             jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft);
         }
+        //分摊税
+        double texh = textotal+btex;//总税额
+        double jktex = 0.00;
+        for(JkxlDetailFee jkxlDetailFee : list){
+            jktex += jkxlDetailFee.getTex();
+        }
+        double texr = texh-jktex;
+        for(JkxlDetailFee jkxlDetailFee : list){
+            double texrate = jkxlDetailFee.getTex()/jktex;
+            double tex = texr*texrate;
+            jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+            jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
+
+        }
         //计算差额
         for(JkxlDetailFee jkxlDetailFee : list){
             tz += jkxlDetailFee.getTotalFee();

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

@@ -134,7 +134,7 @@ public class SubstationService {
        //获取结算表中基础数据
        double jsCs = ExcelUtil.getDouble(total,BashInfo.JS_CSXM,1,2);
        double jsGf = ExcelUtil.getDouble(total,BashInfo.JS_GF,1,2);
-//       double jsTex = ExcelUtil.getTex(total);
+       double textotal = ExcelUtil.getTex(total);
         if(jzgc !=0.00 && azgc != 0.00){
             ImportExcel jzqd = new ImportExcel(file, 1, SubstationInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
             ImportExcel azqd = new ImportExcel(file, 1, SubstationInfo.SHEET_AZFBFXJJ,true);  //安装分部分项工程量清单计价表
@@ -372,6 +372,24 @@ public class SubstationService {
                 jkxlDetailFee1.setTex(jkxlDetailFee1.getTex()+texft);
                 jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft+texft);
             }
+            //分摊税
+            double texh = textotal+btex;//总税额
+            double jktex = jzTotal.get(0).getTex()+azTotal.get(0).getTex();
+            double texr = texh-jktex;
+            for(JkxlDetailFee jkxlDetailFee : jzTotal){
+                double texrate = jkxlDetailFee.getTex()/jktex;
+                double tex = texr*texrate;
+                jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+                jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
+
+            }
+            for(JkxlDetailFee jkxlDetailFee : azTotal){
+                double texrate = jkxlDetailFee.getTex()/jktex;
+                double tex = texr*texrate;
+                jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+                jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
+
+            }
             //计算差额
             double tz = jzTotal.get(0).getTotalFee()+azTotal.get(0).getTotalFee();//总合计金额
 
@@ -535,7 +553,17 @@ public class SubstationService {
                 jkxlDetailFee1.setTex(jkxlDetailFee1.getTex()+texft);
                 jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft+texft);
             }
+            //分摊税
+            double texh = textotal+btex;//总税额
+            double jktex = jzTotal.get(0).getTex();
+            double texr = texh-jktex;
+            for(JkxlDetailFee jkxlDetailFee : jzTotal){
+                double texrate = jkxlDetailFee.getTex()/jktex;
+                double tex = texr*texrate;
+                jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+                jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
 
+            }
             double tz = jzTotal.get(0).getTotalFee();//总合计金额
 
             if(wsbFees != null && wsbFees.size()>0){
@@ -704,6 +732,16 @@ public class SubstationService {
                 jkxlDetailFee1.setTex(jkxlDetailFee1.getTex()+texft);
                 jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft+texft);
             }
+            //分摊税
+            double texh = textotal+btex;//总税额
+            double jktex = azTotal.get(0).getTex();
+            double texr = texh-jktex;
+            for(JkxlDetailFee jkxlDetailFee : azTotal){
+                double texrate = jkxlDetailFee.getTex()/jktex;
+                double tex = texr*texrate;
+                jkxlDetailFee.setTex(jkxlDetailFee.getTex()+tex);
+                jkxlDetailFee.setTotalFee(jkxlDetailFee.getTotalFee()+tex);
+            }
 
             double tz = azTotal.get(0).getTotalFee();//总合计金额