1111

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

@@ -251,7 +251,9 @@ public List<JkxlDetailFee> findList(String id,String type){
         if(ImportExcel.getSheet(csqd2) != null){
             wordtotal2 = SubstationInfo.getCsJzFee(csqd2);
         }
-        double[] aqwmFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //安全文明施工费
+//        double[] aqwmFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //安全文明施工费
+//        double[] aqwmJzFees = BashInfo.getAqwfJzFee(csqd1);  //建筑安全文明施工费
+        double[] aqwmFees = BashInfo.getAqwfJzFee(csqd);  //安全文明施工费
         double gfFees = BashInfo.getJkGf(gf); //规费合计
         double cbperson =  0.0; //承包人采购设备费
         if(ImportExcel.getSheet(cbrsb) != null){
@@ -528,7 +530,8 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[][] originalJzFees = ExcelUtil.getDoubleArrays(jzqd,BashInfo.MX_JZ,2, new int[]{13, 14, 15, 17}); //获取建筑原始费用
             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[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+            double[] aqwmJzFees = BashInfo.getAqwfJzFee(csqd);  //建筑安全文明施工费
             double jxslJz = 0.00;
             if(fbrJzFee != 0.00){
                 double zgJz = zjgcJzTotal-(aqwmJzFees[1]/(aqwmJzFees[0]/100));
@@ -711,7 +714,8 @@ public List<JkxlDetailFee> findList(String id,String type){
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,BashInfo.QT_HJ,0,3);//建筑直接工程费合计
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,3);//安装直接工程费合计
             double rgAzTotal = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,4);//安装人工费费合计
-            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+//            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd,BashInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+            double[] aqwmJzFees = BashInfo.getAqwfJzFee(csqd);  //建筑安全文明施工费
             double[] aqwmAzFees = BashInfo.getAqwfAzFee(csqd);  //安装安全文明施工费
             double jxslJz = 0.00;
             double jxslAz = 0.00;

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

@@ -190,10 +190,10 @@ public class BashInfo {
         double totalRate = 0.00;
         for(int i=2;i<lastRow;i++){
             String type = importExcel.getValue(i+1,1);
-            if(type.equals(CS_LS)){
+            if(type.contains(CS_LS)){
                 lsRate = importExcel.getDouble(i+1,3);
             }
-            if(type.equals(CS_AQWM)){
+            if(type.contains(CS_AQWM)){
                 aqRate = importExcel.getDouble(i+1,3);
             }
             totalRate += importExcel.getDouble(i+1,3);
@@ -215,10 +215,10 @@ public class BashInfo {
         for(int i=2;i<lastRow;i++){
             String type = importExcel.getValue(i+1,1);
             String type1 = importExcel.getValue(i+1,0);
-            if(type.equals(CS_LS)){
+            if(type.contains(CS_LS)){
                 lsRate = importExcel.getDouble(i+1,4);
             }
-            if(type.equals(CS_AQWM)){
+            if(type.contains(CS_AQWM)){
                 aqRate = importExcel.getDouble(i+1,4);
             }
             if(type1.equals(QT_HJ)){
@@ -342,10 +342,10 @@ public class BashInfo {
         double totalRate = 0.00;
         for(int i=azRow;i<lastRow;i++){
             String type = importExcel.getValue(i+1,1);
-            if(type.equals(CS_LS)){
+            if(type.contains(CS_LS)){
                 lsRate = importExcel.getDouble(i+1,3);
             }
-            if(type.equals(CS_AQWM)){
+            if(type.contains(CS_AQWM)){
                 aqRate = importExcel.getDouble(i+1,3);
             }
             totalRate += importExcel.getDouble(i+1,3);
@@ -377,11 +377,11 @@ public class BashInfo {
         for(int i=0;i<azRow+1;i++){
             String type = importExcel.getValue(i+1,1);
             String type1 = importExcel.getValue(i+1,0);
-            if(type.equals(CS_LS)){
+            if(type.contains(CS_LS)){
                 lsRate = importExcel.getDouble(i+1,3);
                 ls = importExcel.getDouble(i+1,4);
             }
-            if(type.equals(CS_AQWM)){
+            if(type.contains(CS_AQWM)){
                 aqRate = importExcel.getDouble(i+1,3);
                 aq = importExcel.getDouble(i+1,4);
             }
@@ -417,10 +417,10 @@ public class BashInfo {
         for(int i=azRow;i<lastRow;i++){
             String type = importExcel.getValue(i+1,1);
             String type1 = importExcel.getValue(i+1,0);
-            if(type.equals(CS_LS)){
+            if(type.contains(CS_LS)){
                 lsRate = importExcel.getDouble(i+1,4);
             }
-            if(type.equals(CS_AQWM)){
+            if(type.contains(CS_AQWM)){
                 aqRate = importExcel.getDouble(i+1,4);
             }
             if(type1.equals(QT_XJ)){
@@ -442,7 +442,7 @@ public class BashInfo {
         double wxzyRate = 0.00;
         for (int i = 2; i < lastRow; i++) {
             String type = importExcel.getValue(i + 1, 1);
-            if (type.equals(GF_WXZY)) {
+            if (type.contains(GF_WXZY)) {
                 wxzyRate = importExcel.getDouble(i + 1, 3);
             }
             if (!importExcel.getValue(i + 1, 2).equals("")) {
@@ -464,7 +464,7 @@ public class BashInfo {
         double wxzyRate = 0.00;
         for (int i = 2; i < lastRow; i++) {
             String type = importExcel.getValue(i + 1, 1);
-            if (type.equals(GF_WXZY)) {
+            if (type.contains(GF_WXZY)) {
                 wxzyRate = importExcel.getDouble(i + 1, 3);
             }
             if (!importExcel.getValue(i + 1, 2).equals("")) {
@@ -500,7 +500,7 @@ public class BashInfo {
         double wxzyRate = 0.00;
         for (int i = azRow; i < lastRow; i++) {
             String type = importExcel.getValue(i + 1, 1);
-            if (type.equals(GF_WXZY)) {
+            if (type.contains(GF_WXZY)) {
                 wxzyRate = importExcel.getDouble(i + 1, 3);
             }
             if (!importExcel.getValue(i + 1, 2).equals("")) {
@@ -733,7 +733,37 @@ public class BashInfo {
         return d;
     }
 
+    /**
+     * 建筑安全文明措施费
+     * @param importExcel
+     * @return
+     */
+    public static double[] getAqwfJzFee(ImportExcel importExcel){
+        int lastRow = importExcel.getLastDataRowNum();
+        double d = 0.00;
+        double e = 0.00;
+        for(int i=0;i<lastRow;i++){
+            String type = importExcel.getValue(i+1,1);
+            if(type.equals("")){
+                continue;
+            }
+            if(type.contains(CS_AQWM)){
+                d = importExcel.getDouble(i+1,3);
+                e = importExcel.getDouble(i+1,4);
+                break;
+            }
+        }
+        double[] r = new double[2];
+        r[0] = d;
+        r[1] = e;
+        return r;
+    }
 
+    /**
+     * 安装安全文明措施费
+     * @param importExcel
+     * @return
+     */
     public static double[] getAqwfAzFee(ImportExcel importExcel){
         int lastRow = importExcel.getLastDataRowNum();
         double d = 0.00;
@@ -743,7 +773,7 @@ public class BashInfo {
             if(type.equals("")){
                 continue;
             }
-            if(type.equals(CS_AQWM)){
+            if(type.contains(CS_AQWM)){
                 d = importExcel.getDouble(i+1,3);
                 e = importExcel.getDouble(i+1,4);
             }

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

@@ -122,7 +122,8 @@ public class SubstationService {
 //            double tbrJzFee = BashInfo.getFbrJzFee(tbrsb); //投标人建筑费
 //            double tbrAzFee = BashInfo.getFbrAzFee(tbrsb); //投标人安装费
             double zjgcTotal = zjgcAzTotal+zjgcJzTotal;
-            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+//            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+            double[] aqwmJzFees = BashInfo.getAqwfJzFee(csqd1);  //建筑安全文明施工费
             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);
@@ -442,7 +443,8 @@ 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_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+//            double[] aqwmJzFees = ExcelUtil.getDoubleArray(csqd1,SubstationInfo.CS_AQWM,1, new int[]{3, 4});  //建筑安全文明施工费
+            double[] aqwmJzFees = BashInfo.getAqwfJzFee(csqd1);  //建筑安全文明施工费
             double fbrJzFee = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,2,15);
             double jxslJz = 0.00;
             if (fbrJzFee != 0.00) {