1111

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

@@ -465,7 +465,7 @@ public class BashInfo {
             if(type.equals("")){
                 continue;
             }
-            if (!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("税")) {
                  jkxlAdjustFee = new JkxlAdjustFee();
                  double fee = importExcel.getDouble(j+1,2);
                  jkxlAdjustFee.setType(type);

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

@@ -537,7 +537,7 @@ public class OverheadLineController extends BaseController {
       double[][] zFees = new double[22][2];
        for(JkxlDetailFee jkxlDetailFee : list){
           if(jkxlDetailFee.getWbsCode().equals("21000000")){
-            zFees[0][0] = jkxlDetailFee.getOriginalTotalCost();
+            zFees[0][0] = jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00;
             zFees[1][0] = jkxlDetailFee.getZjgcFee();
             zFees[2][0] = jkxlDetailFee.getOriginalRgCost();
             zFees[3][0] = jkxlDetailFee.getOriginalCbrCost();

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

@@ -93,11 +93,11 @@ public class ProjectController extends BaseController {
      *数据导入
      */
     @RequestMapping("/import")
-    public String importFile(MultipartFile file,WbsItem wbsItem, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) {
+    public String importFile(MultipartFile file,WbsItem wbsItem, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) throws IOException, InvalidFormatException {
         String type = wbsItem.getType();   //项目类型
         String id = getId();
         wbsItem.setId(id);
-        try {
+//        try {
 //            保存数据到数据库
             if(type.equals("1")) {
                 overheadLineService.saveJk(file,wbsItem);
@@ -108,13 +108,13 @@ public class ProjectController extends BaseController {
             if (type.equals("3")) {
                 substationService.save(file,wbsItem);
             }
-        } 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";
+//        }
         addMessage(redirectAttributes, "导入成功");
         return "redirect:/a/jkxl/list?id="+id+"&type="+type;
     }

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

@@ -79,8 +79,8 @@ public class SubstationService {
         ImportExcel csqd2 = new ImportExcel(file,1,SubstationInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
         ImportExcel gf = new ImportExcel(file,1,SubstationInfo.SHEET_GFQD,true);  //规费项目清单计价表
         ImportExcel qt = new ImportExcel(file,1,SubstationInfo.SHEET_QTFY,true);  //其他项目清单计价表
-        ImportExcel fbrcg = new ImportExcel(file,1,SubstationInfo.SHEET_ZBRCGSB,true);   //招标人采购材料设备计价表
-        ImportExcel tbrsb = new ImportExcel(file,1,SubstationInfo.SHEET_TBRCGSB,true);//投标人采购设备计价表
+//        ImportExcel fbrcg = new ImportExcel(file,1,SubstationInfo.SHEET_ZBRCGSB,true);   //招标人采购材料设备计价表
+        ImportExcel tbrsb = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_TBRCGSB,SubstationInfo.SHEET_CBRCGSB},true);//投标人采购设备计价表
         double jzgc = ExcelUtil.getDouble(total,SubstationInfo.HZ_JZGC,1,2);//汇总表建筑金额
         double azgc = ExcelUtil.getDouble(total,SubstationInfo.HZ_AZGC,1,2);//汇总表安装金额
         double texRate = ExcelUtil.getTexRate(total); //获取税率
@@ -137,10 +137,20 @@ public class SubstationService {
             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);
-            double zgJz = zjgcJzTotal-aqwmJzFees[1]/aqwmJzFees[0]*100;
-            double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
-            double jxslJz = zgJz/(fbrJzFee-zgJz); //建筑进项税率
-            double jxslAz = zgAz/(fbrAzFee-zgAz); //安装进项税率
+            double jxslJz = 0.00;
+            double jxslAz = 0.00;
+            if(fbrJzFee != 0.00){
+                double zgJz = zjgcJzTotal-aqwmJzFees[1]/aqwmJzFees[0]*100;
+                 jxslJz = zgJz/(fbrJzFee-zgJz); //建筑进项税率
+            }
+            if(fbrAzFee != 0.00){
+                double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
+                jxslAz = zgAz/(fbrAzFee-zgAz); //安装进项税率
+            }
+//            double zgJz = zjgcJzTotal-aqwmJzFees[1]/aqwmJzFees[0]*100;
+//            double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
+//            double jxslJz = zgJz/(fbrJzFee-zgJz); //建筑进项税率
+//            double jxslAz = zgAz/(fbrAzFee-zgAz); //安装进项税率
             //建筑部分基础数据
             JkxlDetailFee jz = SubstationInfo.getTolalInfo(jzqd,jzhz,"21000000",SubstationInfo.JZMX_BJZ);  //建筑合计
             JkxlDetailFee jzsc = SubstationInfo.getBashInfo(jzqd,jzhz,"21100000",SubstationInfo.JZMX_ZYGC);  //主要生产工程
@@ -324,8 +334,11 @@ public class SubstationService {
             double tbrJzFee = BashInfo.getFbrJzFee(tbrsb); //投标人建筑费
             double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_SGZJ,1, new int[]{3, 4});  //建筑安全文明施工费
             double fbrJzFee = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,15);
-            double zgJz = zjgcJzTotal-aqwmJzFees[1]/aqwmJzFees[0]*100;
-            double jxslJz = zgJz/(fbrJzFee-zgJz); //建筑进项税率
+            double jxslJz = 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);  //主要生产工程
@@ -438,8 +451,12 @@ public class SubstationService {
             double tbrAzFee = BashInfo.getFbrAzFee(tbrsb); //投标人安装费
             double[] aqwmAzFees = BashInfo.getAqwfAzFee(csqd1);  //安装安全文明施工费
             double fbrAzFee = ExcelUtil.getDouble(azqd,SubstationInfo.AZMX_BDZAZ,2,15);
-            double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
-            double jxslAz = zgAz/(fbrAzFee-zgAz); //安装进项税率
+            double jxslAz = 0.00;
+            if(fbrAzFee != 0.00){
+                double zgAz = zjgcAzTotal-aqwmAzFees[1]/aqwmAzFees[0]*100;
+                 jxslAz = zgAz/(fbrAzFee-zgAz); //安装进项税率
+            }
+
             //安装部分基础数据
             JkxlDetailFee az = SubstationInfo.getTolalInfo(azqd,azhz,"23000000",SubstationInfo.AZMX_BDZAZ);  //安装合计
             JkxlDetailFee azsc = SubstationInfo.getBashInfo(azqd,azhz,"23100000",SubstationInfo.AZMX_ZYSCGC);  //主要生产工程

src/main/java/com/jeeplus/modules/sg/substation/util/SubstationInfo.java

@@ -20,6 +20,7 @@ public class SubstationInfo {
     public static final String SHEET_GFQD = "规费项目清单计价表";
     public static final String SHEET_TBRCGCL = "投标人采购材料计价表";
     public static final String SHEET_TBRCGSB = "投标人采购设备计价表";
+    public static final String SHEET_CBRCGSB = "承包人采购设备计价表";
     public static final String SHEET_ZBRCGSB = "招标人采购材料(设备)计价表";
     public static final String SHEET_JZFBFXJJ = "建筑分部分项工程量清单计价表";
     public static final String SHEET_AZFBFXJJ = "安装分部分项工程量清单计价表";