2019-09-05 09:49

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

@@ -35,8 +35,10 @@ public class SettlementService {
     public List<Settlement> selectSettlementService(String id,String type){
         if (type.equals("1")) {
             return SettementUtil.getSelectSettlement(settlementMapper.selectSettlement(id));
-        } else {
-          return SettementUtil.getSelectDlSettlement(settlementMapper.selectSettlement(id));
+        } else if (type.equals("2")){
+            return SettementUtil.getSelectDlSettlement(settlementMapper.selectSettlement(id));
+        }else {
+            return SettementUtil.getSelectBdzSettlement(settlementMapper.selectSettlement(id));
         }
     }
 

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

@@ -118,7 +118,7 @@ public class SettementUtil {
      * @return 《工程竣工表》/《工程项目投资表》 list集合
      */
     public static List<Settlement> getComparison(ImportExcel importExcel){
-        boolean flag = false;//判断 架空 变电站 电缆
+        boolean flag = false;//判断 是否是变电站
         Settlement settlement;
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import com.jeeplus.modules.sg.project.service.ProjectService;
 import com.jeeplus.modules.sg.project.util.ExportUtil;
+import com.jeeplus.modules.sg.substation.service.SubstationService;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

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

@@ -173,11 +173,30 @@ public class SubstationService {
         double[] azgfRate = BashInfo.getAzGfRate(gf);  //获取安装规费率
         double[] qtFees = BashInfo.getQtFees(qt);  //获取其他费用
         double gcjsFee = BashInfo.getGcjsFee(total);  //获取工程结算价
+
+        //变电站 结算汇总
+        List<Settlement> settlementList =  SettementUtil.getComparison(total);
+        double cbperson = 0.0;
+        double word1total =  ExcelUtil.getDouble(csqd1,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double word2total=0.0;
+        double otherDlTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
+        double feesDlCount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
+
+
+        //--------------------------
         if(jzgc !=0.00 && azgc != 0.00){
             ImportExcel jzqd = new ImportExcel(file, 1, SubstationInfo.SHEET_JZFBFXJJ);  //建筑分部分项工程量清单计价表
             ImportExcel azqd = new ImportExcel(file, 1, SubstationInfo.SHEET_AZFBFXJJ);  //安装分部分项工程量清单计价表
             ImportExcel jzhz = new ImportExcel(file, 1, SubstationInfo.SHEET_JZHZB);   //建筑工程费用汇总表
             ImportExcel azhz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB);   //安装工程费用汇总表
+            //架空结算汇总
+            int[] comlumn2 = {12,15};//定义所要数组
+            double built1Total = ExcelUtil.getDouble(jzqd,SubstationInfo.JZMX_BJZ,0,2);//建筑分部分项工程量清单计价表合计
+            double[] builtTotal={built1Total,0.00};
+            double[] division1total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,0,comlumn2);//安装分部分项比对数据清单合计
+            double[] division = {division1total[0],division1total[1],0.00,0.00};
+            List<Settlement> settlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson);
+            settlementService.save(settlements,id);
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,3);//安装直接工程费合计
             double csJzFee = SubstationInfo.getCsJzFee(csqd2);//建筑措施分摊费