Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/OverheadLineMapper.java

@@ -17,5 +17,6 @@ public interface OverheadLineMapper {
     List<JkxlDetailFee> findList(@Param("id") String id,@Param("type")String type);
     List<JkxlDetailFee> getAdjust(String id);
     void updateDate(JkxlDetailFee jkxlDetailFee);
+    void updateList(@Param("list") List<JkxlDetailFee> list);
     void delete(String id);
 }

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/OverheadLineMapper.xml

@@ -240,47 +240,90 @@
 
 
 
-    <update id="updateDate" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">
+    <update id="updateDate" parameterType="java.util.List">
+		<foreach collection="list" item="item" index="index" separator=",">
           update sg_fee_detail_jkxl set
-             <if test="rgFtFee != null and rgFtFee != ''">
-				 rg_fee_ft = #{rgFtFee},
+             <if test="item.rgFtFee != null and item.rgFtFee != ''">
+				 rg_fee_ft = #{item.rgFtFee},
 			 </if>
-		     <if test="cbrFtFee != null and cbrFtFee != ''">
-				 cbr_fee_ft = #{cbrFtFee},
+		     <if test="item.cbrFtFee != null and item.cbrFtFee != ''">
+				 cbr_fee_ft = #{item.cbrFtFee},
 		     </if>
-		     <if test="fbrFtFee != null and fbrFtFee != ''">
-				 fbr_fee_ft =  #{fbrFtFee},
+		     <if test="item.fbrFtFee != null and item.fbrFtFee != ''">
+				 fbr_fee_ft =  #{item.fbrFtFee},
 		     </if>
-		      <if test="jxFtFee != null and jxFtFee != ''">
-				  jx_fee_ft =  #{jxFtFee},
+		      <if test="item.jxFtFee != null and item.jxFtFee != ''">
+				  jx_fee_ft =  #{item.jxFtFee},
 			  </if>
-		      <if test="measuresFee1 != null and measuresFee1 != ''">
-				  measures_fee1 = #{measuresFee1},
+		      <if test="item.measuresFee1 != null and item.measuresFee1 != ''">
+				  measures_fee1 = #{item.measuresFee1},
 		     </if>
-		      <if test="measuresFee2 != null and measuresFee2 != ''">
-				  measures_fee2 = #{measuresFee2},
+		      <if test="item.measuresFee2 != null and item.measuresFee2 != ''">
+				  measures_fee2 = #{item.measuresFee2},
 		     </if>
-		     <if test="measuresFee3 != null and measuresFee3 != ''">
-			       measures_fee3 = #{measuresFee3},
+		     <if test="item.measuresFee3 != null and item.measuresFee3 != ''">
+			       measures_fee3 = #{item.measuresFee3},
 		     </if>
-		     <if test="otherCost != null and otherCost != ''">
-				 other_cost = #{otherCost},
+		     <if test="item.otherCost != null and item.otherCost != ''">
+				 other_cost = #{item.otherCost},
 		     </if>
-		     <if test="fees != null and fees != ''">
-				 fees = #{fees},
+		     <if test="item.fees != null and item.fees != ''">
+				 fees = #{item.fees},
 		     </if>
-		     <if test="tex != null and tex != ''">
-				 tex = #{tex},
+		     <if test="item.tex != null and item.tex != ''">
+				 tex = #{item.tex},
 		    </if>
-		    <if test="totalFee != null and totalFee != ''">
-				total_fee = #{totalFee},
+		    <if test="item.totalFee != null and item.totalFee != ''">
+				total_fee = #{item.totalFee},
 		    </if>
-		    id = #{id}
+		    id = #{item.id}
           <where>
-              id = #{id} and wbs_code = #{wbsCode}
+              id = #{item.id} and wbs_code = #{item.wbsCode}
           </where>
+		</foreach>
     </update>
 
+	<update id="updateList" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">
+		update sg_fee_detail_jkxl set
+		<if test="rgFtFee != null and rgFtFee != ''">
+			rg_fee_ft = #{rgFtFee},
+		</if>
+		<if test="cbrFtFee != null and cbrFtFee != ''">
+			cbr_fee_ft = #{cbrFtFee},
+		</if>
+		<if test="fbrFtFee != null and fbrFtFee != ''">
+			fbr_fee_ft =  #{fbrFtFee},
+		</if>
+		<if test="jxFtFee != null and jxFtFee != ''">
+			jx_fee_ft =  #{jxFtFee},
+		</if>
+		<if test="measuresFee1 != null and measuresFee1 != ''">
+			measures_fee1 = #{measuresFee1},
+		</if>
+		<if test="measuresFee2 != null and measuresFee2 != ''">
+			measures_fee2 = #{measuresFee2},
+		</if>
+		<if test="measuresFee3 != null and measuresFee3 != ''">
+			measures_fee3 = #{measuresFee3},
+		</if>
+		<if test="otherCost != null and otherCost != ''">
+			other_cost = #{otherCost},
+		</if>
+		<if test="fees != null and fees != ''">
+			fees = #{fees},
+		</if>
+		<if test="tex != null and tex != ''">
+			tex = #{tex},
+		</if>
+		<if test="totalFee != null and totalFee != ''">
+			total_fee = #{totalFee},
+		</if>
+		id = #{id}
+		<where>
+			id = #{id} and wbs_code = #{wbsCode}
+		</where>
+	</update>
+
 
 
 	<delete id="delete" parameterType="String">

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

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import com.jeeplus.modules.sg.overheadline.util.SettementUtil;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.service.ItemService;
+import com.jeeplus.modules.sg.substation.util.SubstationInfo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -237,12 +238,12 @@ public List<JkxlDetailFee> findList(String id,String type){
     if(type.equals("3")) {
         for (JkxlDetailFee jkxlDetailFee : list) {
             if (jkxlDetailFee.getWbsCode().equals("21000000")) {
-                jz1 = jkxlDetailFee.getTotalFee();
-                jz2 = jkxlDetailFee.getJzFee();
+                jz1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
+                jz2 = jkxlDetailFee.getJzFee()!=null? jkxlDetailFee.getJzFee():0.00;
             }
             if (jkxlDetailFee.getWbsCode().equals("23000000")) {
-                az1 = jkxlDetailFee.getTotalFee();
-                az2 = jkxlDetailFee.getAzFee();
+                az1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
+                az2 = jkxlDetailFee.getAzFee()!=null? jkxlDetailFee.getAzFee():0.00;
             }
             if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
                 qtTotal += jkxlDetailFee.getTotalFee();
@@ -266,12 +267,12 @@ public List<JkxlDetailFee> findList(String id,String type){
             String wbs = jkxlDetailFee.getWbsCode().substring(0,3);
             String wbs1 = jkxlDetailFee.getWbsCode().substring(3,4);
             if(wbs.equals("491") && !wbs1.equals("0")){
-                jz1 += jkxlDetailFee.getTotalFee();
-                jz2 += jkxlDetailFee.getJzFee();
+                jz1 += jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
+                jz2 += jkxlDetailFee.getJzFee()!=null? jkxlDetailFee.getJzFee():0.00;
             }
             if(wbs.equals("493") && !wbs1.equals("0")){
-                az1 += jkxlDetailFee.getTotalFee();
-                az2 += jkxlDetailFee.getAzFee();
+                az1 += jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
+                az2 += jkxlDetailFee.getAzFee()!=null? jkxlDetailFee.getAzFee():0.00;
             }
             if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
                 qtTotal += jkxlDetailFee.getTotalFee();
@@ -353,6 +354,11 @@ public List<JkxlDetailFee> findList(String id,String type){
     }
 
     @Transactional(readOnly = false)
+    public void updateList(List<JkxlDetailFee> list){
+        overheadLineMapper.updateList(list);
+    }
+
+    @Transactional(readOnly = false)
    public void saveProject(WbsProject wbsProject){
        overheadLineMapper.saveProject(wbsProject);
    }
@@ -382,11 +388,13 @@ public List<JkxlDetailFee> findList(String id,String type){
        //读取表格
        ImportExcel importExcel = new ImportExcel(file,1,BashInfo.SHEET_FBFXJJ,true);  //分部分项工程量清单计价表
        ImportExcel csqd = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CSB,BashInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
+        ImportExcel csqd2 = new ImportExcel(file,1,BashInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
        ImportExcel gf = new ImportExcel(file,1,BashInfo.SHEET_GFQD,true);  //规费项目清单计价表
        ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY,true);  //其他项目清单计价表
-       ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1},true );  //工程项目竣工结算汇总表
+       ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
        ImportExcel gzhz = new ImportExcel(file,1,new String[]{BashInfo.SHEET_GCHZ,BashInfo.SHEET_GCHZ1},true );   //架空线路工程费用汇总
        ImportExcel fbrcg = new ImportExcel(file,1,new String[]{BashInfo.SHEET_FBRCG,BashInfo.SHEET_FBRCG1,BashInfo.SHEET_FBRCG2,BashInfo.SHEET_ZBRCG,BashInfo.SHEET_ZBRCG1},true);   //发包人采购材料设备计价表
+        ImportExcel cbrsb = new ImportExcel(file,1,new String[]{BashInfo.SHEET_TBRCG,BashInfo.SHEET_CBRCG},false);//承包人采购设备计价表
         ImportExcel zyrg = new ImportExcel(file,1,BashInfo.SHEET_ZYRG,true); //主要日工价格表
         //数据核验数据
         List<Settlement> settlementList =  SettementUtil.getComparison(total);
@@ -397,14 +405,21 @@ public List<JkxlDetailFee> findList(String id,String type){
        double[] divisiontotal=ExcelUtil.getDoubleArray(importExcel,BashInfo.PROJECTNAME,2,new int[]{12,15});//获取分部分项比对数据清单
        double feescount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
        //数据核验并保存数据库
-        double wordtotal2 =  0.0;
-        //-------------------------
-      //获取未识别费用
+        double wordtotal2 =  0.0;  //措施费二合计
+        if(ImportExcel.getSheet(csqd2) != null){
+            wordtotal2 = SubstationInfo.getCsJzFee(csqd2);
+        }
+        double csFees2 = ExcelUtil.getDouble(total,BashInfo.CSXM2,1,2);//措施费二
+       //获取未识别费用
         List<JkxlAdjustFee> wsbFees = BashInfo.getWsbFee(total);
         double wsbfee = 0.00;
         //获取补税额
         double btex = BashInfo.getBtex(total);
-//       double[] wsbFees = ExcelUtil.getDoubleArray(total, new String[]{BashInfo.BZZSSL,BashInfo.KJJGCC},1,2);
+       //承包人采购设备费
+        if(ImportExcel.getSheet(cbrsb) != null){
+            cbperson = ExcelUtil.getDouble(cbrsb,BashInfo.QT_HJ,0,6);//承包人合计
+        }
+        double cbrfee = ExcelUtil.getDouble(total,BashInfo.QT_CBRSB,1,2);
        double csFee = ExcelUtil.getDouble(gzhz,BashInfo.HZ_CH,1,2);
        double[] originalTotalFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,2); //获取合计费
        double[] zjgcFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,3);  //获取直接工程费
@@ -450,7 +465,7 @@ public List<JkxlDetailFee> findList(String id,String type){
            double jxCost = originalJxrCost/(1+tcRate[2]); //后机械费
            double measuresFee1 = (zjgcFee-fbrCost*jxsl)*csRate[0]; //措施费一（2）
            double measuresFee2 = rgCost*csRate[1];   //措施费一（1）
-           double measuresFee3 = 0.00; //措施费二
+           double measuresFee3 = csFees2*otherRate; //措施费二
            double fees = rgCost*gfRate[1]*1.12+rgCost*gfRate[0];  //规费
            if(flag){
                 tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
@@ -497,6 +512,15 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setTotalFee(total1+btex*rate);
             }
         }
+        //承包人采购设备费
+        if(cbrfee != 0.00){
+            for(JkxlDetailFee jkxlDetailFee : list){
+                if(jkxlDetailFee.getWbsCode().equals("39400000")){
+                    double total1 = jkxlDetailFee.getTotalFee();
+                    jkxlDetailFee.setTotalFee(cbrfee+total1);
+                }
+            }
+        }
         for(JkxlDetailFee jkxlDetailFee : list){
             tz += jkxlDetailFee.getTotalFee();
         }
@@ -520,14 +544,8 @@ public List<JkxlDetailFee> findList(String id,String type){
        list.add(jkxlDetailFee1);
        list.add(jkxlDetailFee2);
        //保存费用明细
-//       for(JkxlDetailFee jkxlDetailFee:list){
-//           overheadLineMapper.save(jkxlDetailFee);
-//       }
         overheadLineMapper.saveList(list);
        //保存未识别费用
-//       for(JkxlAdjustFee jkxlAdjustFee : wsbFees){
-//           feeAdjustService.save(jkxlAdjustFee);
-//       }
        JkxlAdjustFee jkxlAdjustFee2 = new JkxlAdjustFee();
        jkxlAdjustFee2.setId(id);
        jkxlAdjustFee2.setType(BashInfo.CE);
@@ -565,15 +583,18 @@ public List<JkxlDetailFee> findList(String id,String type){
         tcRate[1] = ruleRatioService.getValueByName(BashInfo.RATIO_CLTC).getValue()/100;
         tcRate[2] = ruleRatioService.getValueByName(BashInfo.RATIO_JXTC).getValue()/100;
         //读取表格
-        ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1},true );  //工程项目竣工结算汇总表
+        ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
         ImportExcel csqd = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CSB,BashInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
+        ImportExcel csqd2 = new ImportExcel(file,1,BashInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
         ImportExcel gf = new ImportExcel(file,1,BashInfo.SHEET_GFQD,true);  //规费项目清单计价表
         ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY,true);  //其他项目清单计价表
         ImportExcel fbrcg = new ImportExcel(file,1,new String[]{BashInfo.SHEET_FBRCG,BashInfo.SHEET_FBRCG1,BashInfo.SHEET_FBRCG2,BashInfo.SHEET_ZBRCG,BashInfo.SHEET_ZBRCG1},true);   //发包人采购材料设备计价表
+        ImportExcel cbrsb = new ImportExcel(file,1,new String[]{BashInfo.SHEET_TBRCG,BashInfo.SHEET_CBRCG},false);//承包人采购设备计价表
         List<Settlement> settlementList =  SettementUtil.getComparison(total);
         double cbperson = 0.0;
         double word1total =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
         double word2total=0.0;
+        double csFees2 = ExcelUtil.getDouble(total,BashInfo.CSXM2,1,2);//措施费二
         double otherDlTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
         double feesDlCount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
         int[] comlumn2 = {12,15};//定义所要数组
@@ -593,6 +614,11 @@ public List<JkxlDetailFee> findList(String id,String type){
         double totalfee = 0.00;  //合计
         //获取补税额
         double btex = BashInfo.getBtex(total);
+        //承包人采购设备费
+        if(ImportExcel.getSheet(cbrsb) != null){
+            cbperson = ExcelUtil.getDouble(cbrsb,BashInfo.QT_HJ,0,6);//投标人合计
+        }
+        double cbrfee = ExcelUtil.getDouble(total,BashInfo.QT_CBRSB,1,2);
         List<JkxlDetailFee> list = new ArrayList<>();
         if(jzgc !=0.00 && azgc == 0.00){
             ImportExcel jzqd = new ImportExcel(file,1,BashInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
@@ -639,8 +665,6 @@ public List<JkxlDetailFee> findList(String id,String type){
                 double measuresFee2 = 0.00;   //措施费一（1）
                 double measuresFee3 = 0.00; //措施费二
                 double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[0]+(zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[1]*0.2;  //规费
-//                double tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee)*texRate; //税金
-//                double totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
                 if(flag){
                     tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
@@ -716,10 +740,8 @@ public List<JkxlDetailFee> findList(String id,String type){
                 double jxCost = originalJxrCost/(1+tcRate[2]); //后机械费
                 double measuresFee1 = (zjgcAzFee-originalFbrCost/(1+jxslAz)*jxslAz)*azcsRate[0]+(rgAzFee/(1+tcRate[0])*azcsRate[1]); //措施费一（2）
                 double measuresFee2 = 0.00;   //措施费一（1）
-                double measuresFee3 = 0.00; //措施费二
+                double measuresFee3 = csFees2*originalTotalCost/fbfxFee; //措施费二
                 double fees = rgAzFee/(1+tcRate[0])*azgfRate[0]+rgAzFee/(1+tcRate[0])*azgfRate[1]*1.2;  //规费
-//                double tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee)*texRate; //税金
-//                double totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
                 if(flag){
                     tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
@@ -813,10 +835,8 @@ public List<JkxlDetailFee> findList(String id,String type){
                 double jxCost = originalJxrCost/(1+tcRate[2]); //后机械费
                 double measuresFee1 = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzcsRate; //措施费一（2）
                 double measuresFee2 = 0.00;   //措施费一（1）
-                double measuresFee3 = 0.00; //措施费二
+                double measuresFee3 = csFees2*originalTotalCost/fbfxFee; //措施费二
                 double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[0]+(zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[1]*0.2;  //规费
-//                double tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee)*texRate; //税金
-//                double totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
                 if(flagJz && flagAz){
                     tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
@@ -861,10 +881,8 @@ public List<JkxlDetailFee> findList(String id,String type){
                 double jxCost = originalJxrCost/(1+tcRate[2]); //后机械费
                 double measuresFee1 = (zjgcAzFee-originalFbrCost/(1+jxslAz)*jxslAz)*azcsRate[0]+(rgAzFee/(1+tcRate[0])*azcsRate[1]); //措施费一（2）
                 double measuresFee2 = 0.00;   //措施费一（1）
-                double measuresFee3 = 0.00; //措施费二
+                double measuresFee3 = csFees2*originalTotalCost/fbfxFee; //措施费二
                 double fees = rgAzFee/(1+tcRate[0])*azgfRate[0]+rgAzFee/(1+tcRate[0])*azgfRate[1]*1.2;  //规费
-//                double tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee)*texRate; //税金
-//                double totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
                 if(flagJz && flagAz){
                     tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
@@ -909,6 +927,18 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jkxlDetailFee.setTotalFee(total1+btex*rate);
             }
         }
+        //承包人设备费
+        if(cbrfee != 0.00){
+            for(JkxlDetailFee jkxlDetailFee : list){
+                double total1 = jkxlDetailFee.getTotalFee();
+                if(jkxlDetailFee.getWbsCode().equals("49320000") && jkxlDetailFee.getTotalFee() != 0.00){
+                    jkxlDetailFee.setTotalFee(total1+cbrfee);
+                } else {
+                    double rate = jkxlDetailFee.getOriginalTotalCost()/fbfxFee;
+                    jkxlDetailFee.setTotalFee(total1+cbrfee*rate);
+                }
+            }
+        }
         for(JkxlDetailFee jkxlDetailFee : list){
             tz += jkxlDetailFee.getTotalFee();
         }
@@ -932,10 +962,6 @@ public List<JkxlDetailFee> findList(String id,String type){
         list.add(jkxlDetailFee1);
         list.add(jkxlDetailFee2);
         overheadLineMapper.saveList(list);
-//        //保存未识别费用
-//        for(JkxlAdjustFee jkxlAdjustFee : wsbFees){
-//            feeAdjustService.save(jkxlAdjustFee);
-//        }
         JkxlAdjustFee jkxlAdjustFee2 = new JkxlAdjustFee();
         jkxlAdjustFee2.setId(id);
         jkxlAdjustFee2.setType(BashInfo.CE);

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

@@ -15,8 +15,10 @@ public class BashInfo {
     public static final String SHEET_FBFXJJ = "分部分项工程量清单计价表";
     public static final String SHEET_HZB = "工程项目竣工结算汇总表";
     public static final String SHEET_HZB1 = "工程项目投标报价汇总表";
+    public static final String SHEET_HZB2 = "工程项目最高投标限价汇总表";
     public static final String SHEET_CSB = "措施项目清单计价表（一）";
     public static final String SHEET_CSB1 = "措施项目清单计价表一";
+    public static final String SHEET_CSB2 = "措施项目清单计价表（二）";
     public static final String SHEET_QTFY = "其他项目清单计价表";
     public static final String SHEET_GFQD = "规费项目清单计价表";
     public static final String SHEET_GCHZ = "架空线路工程费用汇总表";
@@ -27,6 +29,7 @@ public class BashInfo {
     public static final String SHEET_ZBRCG = "招标人采购材料(设备)计价表";
     public static final String SHEET_ZBRCG1 = "招标人采购材料设备计价表";
     public static final String SHEET_CBRCG = "承包人采购设备计价表";
+    public static final String SHEET_TBRCG = "投标人采购设备计价表";
     public static final String SHEET_JZFBFXJJ = "建筑分部分项工程量清单计价表";
     public static final String SHEET_AZFBFXJJ = "安装分部分项工程量清单计价表";
     public static final String SHEET_JZHZB = "电缆线路建筑工程费用汇总表";
@@ -53,20 +56,19 @@ public class BashInfo {
     public static final String RATIO_RGTC = "人工调差系数";
     public static final String RATIO_CLTC = "材料调差系数";
     public static final String RATIO_JXTC = "机械调差系数";
-    public static final String RATIO_CCRGTC = "拆除人工调差系数";
-    public static final String RATIO_CCCLTC = "拆除材料调差系数";
-    public static final String RATIO_CCJXTC = "拆除机械调差系数";
 
     public static final String CS_LS = "临时设施费";
     public static final String CS_AQWM = "安全文明施工费";
     public static final String GF_WXZY = "危险作业意外伤害保险费";
     public static final String QT_SGCDZY = "施工场地租用费";
     public static final String QT_ZBDL = "招标代理";
+    public static final String QT_CBRSB = "承包人采购设备费";
     public static final String QT_HJ = "合计";
     public static final String QT_XJ = "小计";
     public static final String BZZSSL = "补增值税税率调整差额";
     public static final String KJJGCC = "扣减甲供材超供材料费";
     public static final String KJYJSG = "扣夜间施工增加费";
+    public static final String CSXM2 = "措施项目（二）";
     public static final String GCJS = "工程结算价";
     public static final String TBJG = "竣工结算价合计";
     public static final String TBJG1 = "投标报价";

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

@@ -74,7 +74,7 @@ public class SubstationService {
         tcRate[2] = ruleRatioService.getValueByName(SubstationInfo.RATIO_JXTC).getValue()/100;
 
         //读取表格
-        ImportExcel total = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_HZB,SubstationInfo.SHEET_HZB1},true );  //工程项目竣工结算汇总表
+        ImportExcel total = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_HZB,SubstationInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
         ImportExcel csqd1 = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_CSB,SubstationInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
         ImportExcel csqd2 = new ImportExcel(file,1,SubstationInfo.SHEET_CSB2,false);  // 措施项目清单计价表（二）
         ImportExcel gf = new ImportExcel(file,1,SubstationInfo.SHEET_GFQD,true);  //规费项目清单计价表
@@ -158,10 +158,6 @@ public class SubstationService {
                     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);  //主要生产工程

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

@@ -13,6 +13,7 @@ public class SubstationInfo {
     public static final String SHEET_FBFXJJ = "分部分项工程量清单计价表";
     public static final String SHEET_HZB = "工程项目竣工结算汇总表";
     public static final String SHEET_HZB1 = "工程项目投标报价汇总表";
+    public static final String SHEET_HZB2 = "工程项目最高投标限价汇总表";
     public static final String SHEET_CSB = "措施项目清单计价表（一）";
     public static final String SHEET_CSB1 = "措施项目清单计价表一";
     public static final String SHEET_CSB2 = "措施项目清单计价表（二）";