Merge remote-tracking branch 'origin/master'

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

@@ -416,7 +416,8 @@ public List<JkxlDetailFee> findList(String id,String type){
        double[] gfRate = BashInfo.getGfRate(gf);  //获取规费率
        double[] qtFees = BashInfo.getQtFees(qt);  //获取其他费用
        double gcjsFee = BashInfo.getGcjsFee(total);  //获取工程结算价
-       double fbrFee = ExcelUtil.getDouble(fbrcg,BashInfo.QT_HJ,0,6); //发包人采购计价表合计金额
+//       double fbrFee = ExcelUtil.getDouble(fbrcg,BashInfo.QT_HJ,0,6); //发包人采购计价表合计金额
+       double fbrFee = ExcelUtil.getDouble(importExcel,BashInfo.PROJECTNAME,2,15); //发包人采购计价表合计金额
        double zjgcTotal = ExcelUtil.getDouble(gzhz,BashInfo.QT_HJ,0,3);//直接工程费合计
        double[] aqwmFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //安全文明施工费
        double zg = zjgcTotal-(aqwmFees[1]/(aqwmFees[0]/100));
@@ -601,7 +602,8 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[] originalTotalJzFees = ExcelUtil.getDoubleArray(jzhz,BashInfo.HZ_JZ,1,2); //获取建筑合计费
             double[] zjgcJzFees = ExcelUtil.getDoubleArray(jzhz,BashInfo.HZ_JZ,1,3);  //获取建筑直接工程费
             double[][] originalJzFees = ExcelUtil.getDoubleArrays(jzqd,BashInfo.MX_JZ,2, new int[]{13, 14, 15, 17}); //获取建筑原始费用
-            double fbrJzFee = ExcelUtil.getDouble(fbrcg,BashInfo.QT_XJ,0,6); //建筑发包人采购计价表合计金额
+//            double fbrJzFee = ExcelUtil.getDouble(fbrcg,BashInfo.QT_XJ,0,6); //建筑发包人采购计价表合计金额
+            double fbrJzFee = ExcelUtil.getDouble(jzqd,BashInfo.DLJZ,2,15);
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,BashInfo.QT_HJ,0,3);//建筑直接工程费合计
             double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
             double jxslJz = 0.00;
@@ -677,7 +679,8 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[] zjgcAzFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,3);  //获取安装直接工程费
             double[] rgFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,4);  //人工费
             double[][] originalAzFees = ExcelUtil.getDoubleArrays(azqd,BashInfo.MX_AZ,2, new int[]{13, 14, 15, 17}); //获取安装原始费用
-            double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
+//            double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
+            double fbrAzFee = ExcelUtil.getDouble(azqd,BashInfo.DLAZ,2,15);
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,3);//安装直接工程费合计
             double[] aqwmAzFees = BashInfo.getAqwfAzFee(csqd);  //建筑安全文明施工费
             double jxslAz = 0.00;
@@ -758,8 +761,10 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[] rgAzFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,4);  //获取安装人工费
             double[][] originalJzFees = ExcelUtil.getDoubleArrays(jzqd,BashInfo.MX_JZ,2, new int[]{13, 14, 15, 17}); //获取建筑原始费用
             double[][] originalAzFees = ExcelUtil.getDoubleArrays(azqd,BashInfo.MX_AZ,2, new int[]{13, 14, 15, 17}); //获取安装原始费用
-            double fbrJzFee = ExcelUtil.getDouble(fbrcg,BashInfo.QT_XJ,0,6); //建筑发包人采购计价表合计金额
-            double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
+//            double fbrJzFee = ExcelUtil.getDouble(fbrcg,BashInfo.QT_XJ,0,6); //建筑发包人采购计价表合计金额
+////            double fbrAzFee = BashInfo.getFbrAzFee(fbrcg);  //安装发包人采购计价表合计金额
+            double fbrJzFee = ExcelUtil.getDouble(jzqd,BashInfo.DLJZ,2,15);
+            double fbrAzFee = ExcelUtil.getDouble(azqd,BashInfo.DLAZ,2,15);
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,BashInfo.QT_HJ,0,3);//建筑直接工程费合计
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,3);//安装直接工程费合计
             double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费

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

@@ -475,7 +475,7 @@ public class BashInfo {
             if(type.equals("")){
                 continue;
             }
-            if (!type.contains("投标") && !type.contains("结算") && !type.contains("合计") && !type.contains("发包人") && !type.contains("竣工") && !type.contains("招标人") && !type.contains("税")) {
+            if (!type.contains("投标") && !type.contains("结算") && !type.contains("合计") && !type.contains("发包人") && !type.contains("竣工") && !type.contains("招标人") && !type.contains("税金")&& !type.contains("税额")) {
                  jkxlAdjustFee = new JkxlAdjustFee();
                  double fee = importExcel.getDouble(j+1,2);
                  jkxlAdjustFee.setType(type);
@@ -505,7 +505,7 @@ public class BashInfo {
             if(type.equals("")){
                 continue;
             }
-            if (type.contains("税")) {
+            if (type.contains("税金") || type.contains("税额")) {
                 d = importExcel.getDouble(j+1,2);
             }
         }

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -98,7 +98,7 @@ public class ProjectController extends BaseController {
 //        String type = wbsItem.getType();   //项目类型
         String id = getId();
         wbsItem.setId(id);
-        try {
+//        try {
 //            保存数据到数据库
 //            if(type.equals("1")) {
 //                overheadLineService.saveJk(file,wbsItem);
@@ -115,13 +115,13 @@ public class ProjectController extends BaseController {
              }
              addMessage(redirectAttributes, "导入成功");
              return "redirect:/a/jkxl/list?id="+id+"&type="+str;
-        } catch (RuntimeException e) {
-            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
-            return "redirect:/a/project/list";
-        }   catch (Exception e){
-            addMessage(redirectAttributes, "导入失败");
-            return "redirect:/a/project/list";
-        }
+//        } catch (RuntimeException e) {
+//            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
+//            return "redirect:/a/project/list";
+//        }   catch (Exception e){
+//            addMessage(redirectAttributes, "导入失败");
+//            return "redirect:/a/project/list";
+//        }
 //        return "redirect:/a/jkxl/list?id="+id;
     }
 

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

@@ -142,7 +142,7 @@ public class SubstationService {
 //            double tbrJzFee = BashInfo.getFbrJzFee(tbrsb); //投标人建筑费
 //            double tbrAzFee = BashInfo.getFbrAzFee(tbrsb); //投标人安装费
             double zjgcTotal = zjgcAzTotal+zjgcJzTotal;
-            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_SGZJ,1, new int[]{3, 4});  //建筑安全文明施工费
+            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
             double[] aqwmAzFees = BashInfo.getAqwfAzFee(csqd1);  //安装安全文明施工费
             double fbrJzFee = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,15);
             double fbrAzFee = ExcelUtil.getDouble(azqd,SubstationInfo.AZMX_BDZAZ,2,15);
@@ -375,7 +375,7 @@ public class SubstationService {
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计
 //            double csJzFee = SubstationInfo.getCsJzFee(csqd2);//建筑措施分摊费
 //            double tbrJzFee = BashInfo.getFbrJzFee(tbrsb); //投标人建筑费
-            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_SGZJ,1, new int[]{3, 4});  //建筑安全文明施工费
+            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(fbrJzFee != 0.00) {