蔡德晨 %!s(int64=5) %!d(string=hai) anos
pai
achega
75441575fc

+ 2 - 3
src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -422,12 +422,11 @@ public class SubstationService {
             double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
             double fbrJzFee = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,15);
             double jxslJz = 0.00;
-            if(texRate>0.05) {
-                if (fbrJzFee != 0.00) {
+            if (fbrJzFee != 0.00) {
                     double zgJz = zjgcJzTotal - aqwmJzFees[1] / aqwmJzFees[0] * 100;
                     jxslJz = zgJz / (fbrJzFee - zgJz); //建筑进项税率
-                }
             }
+
             //建筑部分基础数据
             JkxlDetailFee jz = SubstationInfo.getTolalInfo(jzqd,jzhz,"21000000",SubstationInfo.JZMX_BJZ);  //建筑合计
             JkxlDetailFee jzsc = SubstationInfo.getBashInfo(jzqd,jzhz,"21100000",SubstationInfo.JZMX_ZYGC);  //主要生产工程