1

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

@@ -152,16 +152,18 @@ public class OverheadLineService {
        ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );  //工程项目竣工结算汇总表
        ImportExcel gzhz = new ImportExcel(file,1,BashInfo.SHEET_GCHZ );   //架空线路工程费用汇总
        ImportExcel fbrcg = new ImportExcel(file,1,BashInfo.SHEET_FBRCG);   //发包人采购材料设备计价表
+        ImportExcel cbrcgsb = new ImportExcel(file,1,BashInfo.SHEET_FBRCG);   //发包人采购设备计价表
         //数据核验数据
        Map<String,Object[]> builtMap = BashInfo.getCompletionWorks(total);//获取工程项目竣工所有数据
        double builtTotal = ExcelUtil.getDouble(gzhz,BashInfo.QT_HJ,0,2);//获取架空线路工程费用汇总表 分部分项 合计
        double wordtotal =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表
        double otherTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
+        double cbperson =  ExcelUtil.getDouble(cbrcgsb,BashInfo.SHEET_CBRCG,0,2);//获取其他项目费合计
        int[] comlumn2 = {12,14,15};//定义所要数组
        double[] divisiontotal=ExcelUtil.getDoubleArray(importExcel,BashInfo.PROJECTNAME,2,comlumn2);//获取分部分项比对数据清单
        double feescount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
        //数据核验并保存数据库
-       settlementService.save(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,id);
+       settlementService.save(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,cbperson,id);
       //获取补增值税税率调整差额和扣减甲供材超供材料费
        double[] wsbFees = ExcelUtil.getDoubleArray(total, new String[]{BashInfo.BZZSSL,BashInfo.KJJGCC},1,2);
        double[] originalTotalFees = ExcelUtil.getDoubleArray(gzhz,BashInfo.HZ_ALL,1,2); //获取合计费

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

@@ -22,8 +22,8 @@ public class SettlementService {
         添加结算工程表
      */
     @Transactional
-    public void save(Map<String,Object[]> builtMap, double builtTotal, double[] divisiontotal, double wordtotal, double otherTotal, double feescount, String id){
-        List<Settlement> settlementList = BashInfo.getTotality(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,id);
+    public void save(Map<String,Object[]> builtMap, double builtTotal, double[] divisiontotal, double wordtotal, double otherTotal, double feescount,double cbperson,String id){
+        List<Settlement> settlementList = BashInfo.getTotality(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,cbperson,id);
         for (Settlement settlement:settlementList){
             settlementMapper.sava(settlement);
         }
@@ -38,6 +38,8 @@ public class SettlementService {
         String[] amout;
         String status;
         String reason;
+        String reason1;
+        String reason2;
         for(Settlement settlement:settlementList){
             money=0.0;
             reason="";
@@ -48,7 +50,9 @@ public class SettlementService {
                    theAmout =  settlement.getTheAmount();
                    amout = theAmout.split(",");
                    status = settlement.getStatus();
-                   reason = SettementUtil.RESON_FBFX1.replaceAll("xxx",String.valueOf(money)).replace("yyy",amout[0]);
+                   reason1 = SettementUtil.RESON_FBFX1.replaceAll("xxx",String.valueOf(money)).replace("yyy",amout[0]);
+                    reason2 = SettementUtil.RESON_FBFX2.replaceAll("xxx",String.valueOf(money)).replace("yyy",amout[1]);
+                    reason=reason1+reason2;
                    settlement.setReason(reason);
                     break;
                 case  BashInfo.JS_CBRF:

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

@@ -17,6 +17,7 @@ public class BashInfo {
     public static final String SHEET_GFQD = "规费项目清单计价表";
     public static final String SHEET_GCHZ = "架空线路工程费用汇总表";
     public static final String SHEET_FBRCG = "发包人采购材料设备计价表";
+    public static final String SHEET_CBRCG = "承包人采购设备计价表";
 
     public static final String JCGC = "1 基础工程";
     public static final String GTGC = "2 杆塔工程";
@@ -301,10 +302,10 @@ public class BashInfo {
      * @param id
      * @return
      */
-    public static List<Settlement> getTotality(Map<String,Object[]> builtMap, double builtTotal, double[] divisiontotal, double wordtotal, double otherTotal, double feescount, String id){
+    public static List<Settlement> getTotality(Map<String,Object[]> builtMap, double builtTotal, double[] divisiontotal, double wordtotal, double otherTotal, double feescount,double cbperson, String id){
         List<Settlement> list = new ArrayList<Settlement>();
         String key="";//汇总表中的值
-
+        String cbper="";
         String fbfx="";
         String cbrcg="";
         String csf="";
@@ -342,11 +343,11 @@ public class BashInfo {
                     count+=money;
                     break;
                 case  BashInfo.JS_CBRF:
-                    if(money==divisiontotal[1]){
+                    if(money==cbperson){
                         status="0";
                     }
                     cbrcg=String.valueOf(money);
-                    theAmount=String.valueOf(divisiontotal[1]);
+                    theAmount=String.valueOf(cbperson);
                     count+=money;
                     break;
                 case BashInfo.JS_CSXM: