1111

src/main/java/com/jeeplus/common/utils/sg/ExcelUtil.java

@@ -32,6 +32,26 @@ public class ExcelUtil {
         return d;
     }
 
+    public static double getDouble(ImportExcel importExcel,String[] st,int column1,int column2){
+        int lastRow = importExcel.getLastDataRowNum();
+        double d = 0.00;
+        for(int i=0;i<lastRow;i++){
+            String type = importExcel.getValue(i+1,column1);
+            if(type.equals("")){
+                continue;
+            }
+            for(int j=0;j<st.length;j++) {
+                if (type.equals(st[j])) {
+                    d = importExcel.getDouble(i + 1, column2);
+                    if(d != 0.00){
+                        break;
+                    }
+                }
+            }
+        }
+        return d;
+    }
+
 
 
     /**

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

@@ -415,7 +415,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                jkxlAdjustFee.setId(id);
                feeAdjustService.save(jkxlAdjustFee);
                double fee = jkxlAdjustFee.getFee();
-               if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+               if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
                    fee = fee* -1;
                 }
                wsbfee += fee;
@@ -492,8 +492,8 @@ public List<JkxlDetailFee> findList(String id,String type){
         int[] comlumn2 = {12,15};//定义所要数组
         List<JkxlAdjustFee> wsbFees = BashInfo.getWsbFee(total);
         double wsbfee = 0.00;
-        double jzgc = ExcelUtil.getDouble(total,BashInfo.HZ_JZGC,1,2);//汇总表建筑金额
-        double azgc = ExcelUtil.getDouble(total,BashInfo.HZ_AZGC,1,2);//汇总表安装金额
+        double jzgc = ExcelUtil.getDouble(total,new String[]{BashInfo.HZ_JZGC,BashInfo.HZ_JZGCF},1,2);//汇总表建筑金额
+        double azgc = ExcelUtil.getDouble(total,new String[]{BashInfo.HZ_AZGC,BashInfo.HZ_AZGCF},1,2);//汇总表安装金额
         double texRate = ExcelUtil.getTexRate(total); //获取税率
         double fbfxFee = ExcelUtil.getDouble(total,BashInfo.JS_FBFX,1,2);  //分部分项工程费
 //        double jzcsRate = BashInfo.getJzRate(csqd); //获取建筑措施费率
@@ -863,7 +863,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlAdjustFee.setId(id);
                 feeAdjustService.save(jkxlAdjustFee);
                 double fee = jkxlAdjustFee.getFee();
-                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
                     fee = fee* -1;
                 }
                 wsbfee += fee;
@@ -1300,7 +1300,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlAdjustFee.setId(id);
                 feeAdjustService.save(jkxlAdjustFee);
                 double fee = jkxlAdjustFee.getFee();
-                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
                     fee = fee* -1;
                 }
                 wsbfee += fee;

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

@@ -84,6 +84,7 @@ public class BashInfo {
     public static final String TBJG2 = "最终结算价";
     public static final String TBJG3 = "最高投标限价";
     public static final String TBJG4 = "最终工程造价";
+    public static final String TBJG5 = "下浮后造价";
     public static final String CE = "差额";
     public static final String CS_JZ = "建筑措施项目";
     public static final String CS_AZ = "安装措施项目";
@@ -116,7 +117,9 @@ public class BashInfo {
     public static final String HZ_TSJSY = "调试及试验";
     public static final String HZ_DLJC = "电缆监测（控）系统";
     public static final String HZ_JZGC = "建筑工程";
+    public static final String HZ_JZGCF = "建筑工程费";
     public static final String HZ_AZGC = "安装工程";
+    public static final String HZ_AZGCF = "安装工程费";
 
     public static final String HZ_FHGL = "复合光缆线路";
     public static final String HZ_JKGL = "架空光缆/音频电缆线路";
@@ -685,7 +688,7 @@ public class BashInfo {
         double gcjs = 0.00;
         for(int i=0;i<lastRow;i++){
             String type = importExcel.getValue(i+1,1);
-            if(type.equals(TBJG) || type.equals(GCJS) || type.equals(TBJG1) || type.equals(TBJG2) || type.equals(TBJG3)|| type.equals(TBJG4)){
+            if(type.equals(TBJG) || type.equals(GCJS) || type.equals(TBJG1) || type.equals(TBJG2) || type.equals(TBJG3)|| type.equals(TBJG4)|| type.equals(TBJG5)){
                 gcjs = importExcel.getDouble(i+1,2);
             }
         }
@@ -711,7 +714,7 @@ public class BashInfo {
         }
         for (int i = 0; i < lastRow; i++) {
             String type = importExcel.getValue(i + 1, 1);
-            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("下浮后造价")) {
                 row2 = i+1;
             }
         }
@@ -759,5 +762,13 @@ public class BashInfo {
         return d;
     }
 
+    public static boolean getFlag(double d ,double e){
+        boolean f = false;
+        if(d != 0.00 || e != 0.00){
+            f = true;
+        }
+        return f;
+    }
+
 
 }

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

@@ -80,8 +80,8 @@ public class SubstationService {
         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,new String[]{SubstationInfo.SHEET_TBRCGSB,SubstationInfo.SHEET_CBRCGSB},false);//投标人采购设备计价表
-        double jzgc = ExcelUtil.getDouble(total,SubstationInfo.HZ_JZGC,1,2);//汇总表建筑金额
-        double azgc = ExcelUtil.getDouble(total,SubstationInfo.HZ_AZGC,1,2);//汇总表安装金额
+        double jzgc = ExcelUtil.getDouble(total,new String[]{BashInfo.HZ_JZGC,BashInfo.HZ_JZGCF},1,2);//汇总表建筑金额
+        double azgc = ExcelUtil.getDouble(total,new String[]{BashInfo.HZ_AZGC,BashInfo.HZ_AZGCF},1,2);//汇总表安装金额
         double texRate = ExcelUtil.getTexRate(total); //获取税率
         double csJzFee = 0.00;  //建筑措施分摊费
         double csAzFee = 0.00;  //安装措施分摊费
@@ -380,7 +380,7 @@ public class SubstationService {
                     jkxlAdjustFee.setId(id);
                     feeAdjustService.save(jkxlAdjustFee);
                     double fee = jkxlAdjustFee.getFee();
-                    if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                    if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
                         fee = fee* -1;
                     }
                     wsbfee += fee;
@@ -544,7 +544,7 @@ public class SubstationService {
                     jkxlAdjustFee.setId(id);
                     feeAdjustService.save(jkxlAdjustFee);
                     double fee = jkxlAdjustFee.getFee();
-                    if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                    if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
                         fee = fee* -1;
                     }
                     wsbfee += fee;
@@ -713,7 +713,7 @@ public class SubstationService {
                     jkxlAdjustFee.setId(id);
                     feeAdjustService.save(jkxlAdjustFee);
                     double fee = jkxlAdjustFee.getFee();
-                    if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣")){
+                    if(jkxlAdjustFee.getType().contains("减") || jkxlAdjustFee.getType().contains("扣") || jkxlAdjustFee.getType().contains("下浮")){
                         fee = fee* -1;
                     }
                     wsbfee += fee;

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

@@ -372,9 +372,11 @@ public class SubstationInfo {
     public static JkxlDetailFee getBashInfo(ImportExcel importExcel,ImportExcel importExcel1,String wbs,String str){
         double[] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
         double d = ExcelUtil.getDouble(importExcel1,str,1,3);  //直接工程费
+//        double e = ExcelUtil.getDouble(importExcel1,str,1,2);  //合计金额
         JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
         jkxlDetailFee.setWbsCode(wbs);
         jkxlDetailFee.setOriginalTotalCost(doubles[0]);
+//        jkxlDetailFee.setOriginalTotalCost(e);
         jkxlDetailFee.setOriginalRgCost(doubles[1]);
         jkxlDetailFee.setOriginalFbrCost(doubles[3]);
         jkxlDetailFee.setOriginalCbrCost(doubles[2]);
@@ -393,8 +395,10 @@ public class SubstationInfo {
         JkxlDetailFee jkxlDetailFee = null;
         for(int i=0;i<str.length;i++){
             double d = ExcelUtil.getDouble(importExcel1,str[i],1,3);  //直接工程费
+//            double e = ExcelUtil.getDouble(importExcel1,str[i],1,3);  //合计
             jkxlDetailFee = new JkxlDetailFee();
             jkxlDetailFee.setWbsCode(wbs[i]);
+//            jkxlDetailFee.setOriginalTotalCost(e);
             jkxlDetailFee.setOriginalTotalCost(doubles[i][0]);
             jkxlDetailFee.setZjgcFee(d);
             jkxlDetailFee.setOriginalRgCost(doubles[i][1]);
@@ -412,6 +416,7 @@ public class SubstationInfo {
     public static List<JkxlDetailFee> getBashInfos(ImportExcel importExcel,ImportExcel importExcel1,String[] wbs,String[] str){
          double[][] doubles = ExcelUtil.getBashArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
          double d = ExcelUtil.getDouble(importExcel1,str[0],1,3);  //直接工程费
+         double e = ExcelUtil.getDouble(importExcel1,str[0],1,2);  //合计
          double total = doubles[0][0];
          int len = str.length;
          double[] zjgc = new double[len];
@@ -423,11 +428,13 @@ public class SubstationInfo {
              }
              zjgc[i] = d*rate;
          }
+//         doubles[0][0] = e;
          List<JkxlDetailFee> jkxlDetailFees = new ArrayList<>();
          JkxlDetailFee jkxlDetailFee = null;
          for(int j=0;j<str.length;j++){
              jkxlDetailFee = new JkxlDetailFee();
              jkxlDetailFee.setOriginalTotalCost(doubles[j][0]);
+//             jkxlDetailFee.setOriginalTotalCost(e);
              jkxlDetailFee.setZjgcFee(zjgc[j]);
              jkxlDetailFee.setOriginalRgCost(doubles[j][1]);
              jkxlDetailFee.setOriginalFbrCost(doubles[j][3]);
@@ -446,9 +453,10 @@ public class SubstationInfo {
     public static JkxlDetailFee getTolalInfo(ImportExcel importExcel,ImportExcel importExcel1,String wbs,String str){
         double[] doubles = ExcelUtil.getDoubleArray(importExcel,str,2,new int[]{12,13, 14, 15, 17});
         double d = ExcelUtil.getDouble(importExcel1,QT_HJ,0,3);  //直接工程费
+        double e = ExcelUtil.getDouble(importExcel1,QT_HJ,0,2);  //合计
         JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
         jkxlDetailFee.setWbsCode(wbs);
-        jkxlDetailFee.setOriginalTotalCost(doubles[0]);
+        jkxlDetailFee.setOriginalTotalCost(e);
         jkxlDetailFee.setOriginalRgCost(doubles[1]);
         jkxlDetailFee.setOriginalFbrCost(doubles[3]);
         jkxlDetailFee.setOriginalCbrCost(doubles[2]);