Merge remote-tracking branch 'origin/master'

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

@@ -204,9 +204,11 @@ public List<JkxlDetailFee> findList(String id,String type){
     }
 
     @Transactional(readOnly = false)
-   public void saveProject(WbsProject wbsProject){
-       overheadLineMapper.saveProject(wbsProject);
-   }
+    public void delete(String id){
+       overheadLineMapper.delete(id);
+    }
+
+
 
    //架空线路保存数据
     @Transactional(readOnly = false)

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

@@ -741,7 +741,7 @@ public class OverheadLineController extends BaseController {
     }
     //变电站项目求和
     if(type.equals(BashInfo.PROJECT_BDZ)){
-      double[][] zFees = new double[22][2];
+      double[][] zFees = new double[14][2];
        for(JkxlDetailFee jkxlDetailFee : list){
           if(jkxlDetailFee.getWbsCode().equals("21000000")){
             zFees[0][0] = jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00;
@@ -751,14 +751,14 @@ public class OverheadLineController extends BaseController {
             zFees[4][0] = jkxlDetailFee.getOriginalFbrCost()!=null? jkxlDetailFee.getOriginalFbrCost():0.00;
             zFees[5][0] = jkxlDetailFee.getOriginalJxCost()!=null? jkxlDetailFee.getOriginalJxCost():0.00;
 //            zFees[6][0] = jkxlDetailFee.getRgCost()!=null? jkxlDetailFee.getRgCost():0.00;
-            zFees[14][0] = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
-            zFees[15][0] = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
-            zFees[16][0] = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
-            zFees[17][0] = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
-            zFees[18][0] = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
-            zFees[19][0] = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
-            zFees[20][0] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
-            zFees[21][0] = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
+            zFees[6][0] = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
+            zFees[7][0] = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
+            zFees[8][0] = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
+            zFees[9][0] = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
+            zFees[10][0] = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
+            zFees[11][0] = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
+            zFees[12][0] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
+            zFees[13][0] = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
           }
          if(jkxlDetailFee.getWbsCode().equals("23000000")){
            zFees[0][1] = jkxlDetailFee.getOriginalTotalCost()!=null? jkxlDetailFee.getOriginalTotalCost():0.00;
@@ -768,14 +768,14 @@ public class OverheadLineController extends BaseController {
            zFees[4][1] = jkxlDetailFee.getOriginalFbrCost()!=null? jkxlDetailFee.getOriginalFbrCost():0.00;
            zFees[5][1] = jkxlDetailFee.getOriginalJxCost()!=null? jkxlDetailFee.getOriginalJxCost():0.00;
 //           zFees[6][1] = jkxlDetailFee.getRgCost()!=null? jkxlDetailFee.getRgCost():0.00;
-           zFees[14][1] = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
-           zFees[15][1] = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
-           zFees[16][1] = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
-           zFees[17][1] = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
-           zFees[18][1] = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
-           zFees[19][1] = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
-           zFees[20][1] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
-           zFees[21][1] = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
+           zFees[6][1] = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
+           zFees[7][1] = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
+           zFees[8][1] = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
+           zFees[9][1] = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
+           zFees[10][1] = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
+           zFees[11][1] = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
+           zFees[12][1] = jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
+           zFees[13][1] = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
          }
        }
       JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
@@ -786,14 +786,14 @@ public class OverheadLineController extends BaseController {
       jkxlDetailFee.setOriginalFbrCost(new BigDecimal(zFees[4][0]+zFees[4][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       jkxlDetailFee.setOriginalJxCost(new BigDecimal(zFees[5][0]+zFees[5][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
 //      jkxlDetailFee.setRgCost(new BigDecimal(zFees[6][0]+zFees[6][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setMeasuresFee1(new BigDecimal(zFees[14][0]+zFees[14][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setMeasuresFee2(new BigDecimal(zFees[15][0]+zFees[15][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setMeasuresFee3(new BigDecimal(zFees[16][0]+zFees[16][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setOtherCost(new BigDecimal(zFees[17][0]+zFees[17][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setFees(new BigDecimal(zFees[18][0]+zFees[18][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setTex(new BigDecimal(zFees[19][0]+zFees[19][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setRgFtFee(new BigDecimal(zFees[20][0]+zFees[20][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-      jkxlDetailFee.setTotalFee(new BigDecimal(zFees[21][0]+zFees[21][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setMeasuresFee1(new BigDecimal(zFees[6][0]+zFees[6][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setMeasuresFee2(new BigDecimal(zFees[7][0]+zFees[7][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setMeasuresFee3(new BigDecimal(zFees[8][0]+zFees[8][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setOtherCost(new BigDecimal(zFees[9][0]+zFees[9][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setFees(new BigDecimal(zFees[10][0]+zFees[10][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setTex(new BigDecimal(zFees[11][0]+zFees[11][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setRgFtFee(new BigDecimal(zFees[12][0]+zFees[12][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+      jkxlDetailFee.setTotalFee(new BigDecimal(zFees[13][0]+zFees[13][1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       jkxlDetailFee.setWbsCode("合计");
       jkxlDetailFee.setParentNode("20000000");
       jkxlDetailFee.setFeeType("1");
@@ -816,7 +816,7 @@ public class OverheadLineController extends BaseController {
     for (JkxlDetailFee jkxlDetailFee :list2){
       total1 += jkxlDetailFee.getTotalFee();
     }
-    double [] zFee = new double[22];
+    double [] zFee = new double[14];
     for(JkxlDetailFee jkxlDetailFee :list1){
       zFee[0] += jkxlDetailFee.getOriginalTotalCost();
       zFee[1] += jkxlDetailFee.getZjgcFee();
@@ -824,14 +824,14 @@ public class OverheadLineController extends BaseController {
       zFee[3] += jkxlDetailFee.getOriginalCbrCost();
       zFee[4] += jkxlDetailFee.getOriginalFbrCost();
       zFee[5] += jkxlDetailFee.getOriginalJxCost();
-      zFee[14] += jkxlDetailFee.getMeasuresFee1();
-      zFee[15] += jkxlDetailFee.getMeasuresFee2();
-      zFee[16] += jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
-      zFee[17] += jkxlDetailFee.getOtherCost();
-      zFee[18] += jkxlDetailFee.getFees();
-      zFee[19] += jkxlDetailFee.getTex();
-      zFee[20] += jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
-      zFee[21] += jkxlDetailFee.getTotalFee();
+      zFee[6] += jkxlDetailFee.getMeasuresFee1();
+      zFee[7] += jkxlDetailFee.getMeasuresFee2();
+      zFee[8] += jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
+      zFee[9] += jkxlDetailFee.getOtherCost();
+      zFee[10] += jkxlDetailFee.getFees();
+      zFee[11] += jkxlDetailFee.getTex();
+      zFee[12] += jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
+      zFee[13] += jkxlDetailFee.getTotalFee();
     }
     JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
     JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
@@ -842,14 +842,14 @@ public class OverheadLineController extends BaseController {
     jkxlDetailFee.setOriginalFbrCost(new BigDecimal(zFee[4]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalJxCost(new BigDecimal(zFee[5]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
 //    jkxlDetailFee.setRgCost(new BigDecimal(zFee[6]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setMeasuresFee1(new BigDecimal(zFee[14]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setMeasuresFee2(new BigDecimal(zFee[15]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setMeasuresFee3(new BigDecimal(zFee[16]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setOtherCost(new BigDecimal(zFee[17]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setFees(new BigDecimal(zFee[18]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setTex(new BigDecimal(zFee[19]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setRgFtFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setTotalFee(new BigDecimal(zFee[21]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setMeasuresFee1(new BigDecimal(zFee[6]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setMeasuresFee2(new BigDecimal(zFee[7]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setMeasuresFee3(new BigDecimal(zFee[8]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setOtherCost(new BigDecimal(zFee[9]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setFees(new BigDecimal(zFee[10]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setTex(new BigDecimal(zFee[11]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setRgFtFee(new BigDecimal(zFee[12]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    jkxlDetailFee.setTotalFee(new BigDecimal(zFee[13]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setWbsCode("合计");
     if(type.equals(BashInfo.PROJECT_JKXL)) {
       jkxlDetailFee.setParentNode("30000000");

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -53,23 +53,7 @@
 		 ORDER BY a.update_date DESC
 
 	</select>
-	
-	<select id="findAllList" resultType="WbsItem" >
-		SELECT 
-			<include refid="infoColumns"/>
-		FROM sg_wbs_item a
-		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.update_date DESC
-			</otherwise>
-		</choose>
-	</select>
+
 
 
 	<update id="updateList" parameterType="java.util.List">
@@ -180,12 +164,12 @@
 
 	<!--根据项目 id 删除其他信息-->
 	<update id="deleteAdjust">
-		update sg_fee_adjust_jkxl set del_flag = 1 where id = #{itemId}
+		update sg_fee_adjust set del_flag = 1 where id = #{itemId}
 	</update>
 
 	<!--根据项目 id 删除差额-->
 	<update id="deleteDetail">
-		update sg_fee_detail_jkxl set del_flag = 1 where id = #{itemId}
+		update sg_fee_detail set del_flag = 1 where id = #{itemId}
 	</update>
 
 	<!--根据项目id查找当前项目所有信息-->

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -6,7 +6,9 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.overheadline.entity.Settlement;
+import com.jeeplus.modules.sg.overheadline.service.FeeAdjustService;
 import com.jeeplus.modules.sg.overheadline.service.OverheadLineService;
+import com.jeeplus.modules.sg.overheadline.service.SettlementService;
 import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
@@ -38,6 +40,10 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
     private OverheadLineService overheadLineService;
     @Autowired
     private SubstationService substationService;
+    @Autowired
+    private SettlementService settlementService;
+    @Autowired
+    private FeeAdjustService feeAdjustService;
 
 
     public WbsProject get(String id) {
@@ -145,6 +151,18 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
 
     @Transactional(readOnly = false)
     public void delete(WbsProject wbsProject) {
+        String id = wbsProject.getId();
+        WbsProject wbsProject1 = get(id);
+        List<WbsItem> wbsItems = wbsProject1.getWbsItems();
+        for(WbsItem wbsItem : wbsItems){
+            String itemId = wbsItem.getId();
+            WbsItem wbsItem1 = new WbsItem();
+            wbsItem1.setId(itemId);
+            itemService.delete(wbsItem1);
+            overheadLineService.delete(itemId);
+            feeAdjustService.delete(itemId);
+            settlementService.delete(itemId);
+        }
         super.delete(wbsProject);
     }
 
@@ -165,12 +183,6 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
         j.setSuccess(true);
         j.setMsg("删除工程成功!");
         try {
-//          List<WbsItem> wbsItems = itemService.findItem(wbsProject.getId());
-//            for (int i = 0; i < wbsItems.size(); i++) {
-//                itemService.deleteCount(wbsItems.get(i).getId());
-//                itemService.deleteAdjust(wbsItems.get(i).getId());
-//                itemService.deleteDetail(wbsItems.get(i).getId());
-//            }
             itemService.deleteItem(wbsProject.getId());
             wbsProject.setDelFlag("1");
             projectMapper.deleteProject(wbsProject);

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

@@ -48,13 +48,13 @@ public class SubstationService {
             itemService.save(wbsItem);
         }
         //读取表格
-        ImportExcel total = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_HZB,SubstationInfo.SHEET_HZB1,BashInfo.SHEET_HZB2,BashInfo.SHEET_HZB3},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);  //规费项目清单计价表
-        ImportExcel qt = new ImportExcel(file,1,SubstationInfo.SHEET_QTFY,true);  //其他项目清单计价表
+        ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2,BashInfo.SHEET_HZB3},true );  //工程项目竣工结算汇总表
+        ImportExcel csqd1 = 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,SubstationInfo.SHEET_ZBRCGSB,true);   //招标人采购材料设备计价表
-        ImportExcel tbrsb = new ImportExcel(file,1,new String[]{SubstationInfo.SHEET_TBRCGSB,SubstationInfo.SHEET_CBRCGSB},false);//投标人采购设备计价表
+        ImportExcel tbrsb = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CBRCG,BashInfo.SHEET_TBRCG},false);//投标人采购设备计价表
         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); //获取税率
@@ -108,8 +108,8 @@ public class SubstationService {
        double textotal = ExcelUtil.getTex(total);
        double fbrFees = ExcelUtil.getFbr(total); //获取发包人费
         if(jzgc !=0.00 && azgc != 0.00){
-            ImportExcel jzqd = new ImportExcel(file, 1, SubstationInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
-            ImportExcel azqd = new ImportExcel(file, 1, SubstationInfo.SHEET_AZFBFXJJ,true);  //安装分部分项工程量清单计价表
+            ImportExcel jzqd = new ImportExcel(file, 1, BashInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
+            ImportExcel azqd = new ImportExcel(file, 1, BashInfo.SHEET_AZFBFXJJ,true);  //安装分部分项工程量清单计价表
             ImportExcel jzhz = new ImportExcel(file, 1, SubstationInfo.SHEET_JZHZB,true);   //建筑工程费用汇总表
             ImportExcel azhz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB,true);   //安装工程费用汇总表
             //变电站结算汇总
@@ -428,7 +428,7 @@ public class SubstationService {
             feeAdjustService.save(jkxlAdjustFee);
         }
         if(jzgc !=0.00 && azgc == 0.00){
-            ImportExcel jzqd = new ImportExcel(file, 1, SubstationInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
+            ImportExcel jzqd = new ImportExcel(file, 1, BashInfo.SHEET_JZFBFXJJ,true);  //建筑分部分项工程量清单计价表
             ImportExcel jzhz = new ImportExcel(file, 1, SubstationInfo.SHEET_JZHZB,true);   //建筑工程费用汇总表
             //变电站结算汇总
             int[] comlumn2 = {12,15};//定义所要数组
@@ -618,7 +618,7 @@ public class SubstationService {
             feeAdjustService.save(jkxlAdjustFee);
         }
         if(jzgc ==0.00 && azgc != 0.00){
-            ImportExcel azqd = new ImportExcel(file, 1, SubstationInfo.SHEET_AZFBFXJJ,true);  //安装分部分项工程量清单计价表
+            ImportExcel azqd = new ImportExcel(file, 1, BashInfo.SHEET_AZFBFXJJ,true);  //安装分部分项工程量清单计价表
             ImportExcel azhz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB,true);   //安装工程费用汇总表
             //变电站结算汇总
             int[] comlumn2 = {12,15};//定义所要数组

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

@@ -10,21 +10,6 @@ import java.util.List;
 import java.util.Map;
 
 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 = "措施项目清单计价表（二）";
-    public static final String SHEET_QTFY = "其他项目清单计价表";
-    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 = "安装分部分项工程量清单计价表";
     public static final String SHEET_JZHZB = "变电站建筑工程费用汇总表";
     public static final String SHEET_HZHZB = "变电站安装工程费用汇总表";