Merge remote-tracking branch 'origin/master'

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

@@ -528,7 +528,10 @@ public List<JkxlDetailFee> findList(String id,String type){
         double azcs = BashInfo.getAzCs(csqd);
 //        double word1total =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
         double word1total = jzcs+azcs;//获取措施费清单计价表一
-        double word2total=0.0;
+        double word2total=0.0; //清单表措施费二合计
+        if(ImportExcel.getSheet(csqd2) != null){
+            word2total = SubstationInfo.getCsJzFee(csqd2);
+        }
         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);//获取规费合计