Merge remote-tracking branch 'origin/master'

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

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

@@ -96,7 +96,7 @@ public class OverheadLineService {
                jkxlDetailFee.setAzFee(azTotal);
                jkxlDetailFee.setQtFee(otherTotal);
            }
-           if(jkxlDetailFee.getWbsCode().equals("44000000") || jkxlDetailFee.getWbsCode().equals("34000000")){
+           if(jkxlDetailFee.getWbsCode().equals("44000000")){
                jkxlDetailFee.setTotalFee(qtTotal);
 
            }
@@ -158,14 +158,14 @@ public class OverheadLineService {
        ImportExcel qt = new ImportExcel(file,1,BashInfo.SHEET_QTFY);  //其他项目清单计价表
        ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );  //工程项目竣工结算汇总表
        ImportExcel gzhz = new ImportExcel(file,1,BashInfo.SHEET_GCHZ );   //架空线路工程费用汇总
-       ImportExcel fbrcg = new ImportExcel(file,1,new String[]{BashInfo.SHEET_FBRCG,BashInfo.SHEET_FBRCG1});   //发包人采购材料设备计价表
+       ImportExcel fbrcg = new ImportExcel(file,1,BashInfo.SHEET_FBRCG);   //发包人采购材料设备计价表
         ImportExcel cbrcgsb = new ImportExcel(file,1,BashInfo.SHEET_FBRCG);   //发包人采购设备计价表
         //数据核验数据
         List<Settlement> settlementList =  SettementUtil.getComparison(total);
        double builtTotal = ExcelUtil.getDouble(gzhz,BashInfo.QT_HJ,0,2);//获取架空线路工程费用汇总表 分部分项 合计
-       double wordtotal1 =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表
+       double wordtotal1 =  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);//获取其他项目费合计
+        double cbperson =  0.0;
        int[] comlumn2 = {12,15};//定义所要数组
        double[] divisiontotal=ExcelUtil.getDoubleArray(importExcel,BashInfo.PROJECTNAME,2,comlumn2);//获取分部分项比对数据清单
        double feescount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
@@ -313,19 +313,28 @@ public class OverheadLineService {
         ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );  //工程项目竣工结算汇总表
         ImportExcel jzhz = new ImportExcel(file,1,BashInfo.SHEET_JZHZB );   //电缆线路建筑工程费用汇总表
         ImportExcel azhz = new ImportExcel(file,1,BashInfo.SHEET_HZHZB );   //电缆线路安装工程费用汇总表
-        ImportExcel fbrcg = new ImportExcel(file,1,new String[]{BashInfo.SHEET_FBRCG,BashInfo.SHEET_FBRCG1});   //发包人采购材料设备计价表
-//        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);//获取规费合计
+        ImportExcel fbrcg = new ImportExcel(file,1,BashInfo.SHEET_FBRCG);   //发包人采购材料设备计价表
+        List<Settlement> settlementList =  SettementUtil.getComparison(total);
+        double built1Total = ExcelUtil.getDouble(jzhz,BashInfo.QT_HJ,0,2);//建筑分布分项工程量清单计价表合计
+        double built2Total = ExcelUtil.getDouble(azhz,BashInfo.QT_HJ,0,2);//安装分部分项工程量清单计合计
+        double[] builtTotal={built1Total,built2Total};
+        List<Settlement> settlementDLList =  SettementUtil.getComparison(total);
+        double wordtotal1 =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表
+        double otherTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
+        double cbperson = 0.0;
+        double word1total =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double word2total=0.0;
+        double world2total=0.0;//措施费二
+        double otherDlTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
+        double feesDlCount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
+        int[] comlumn2 = {12,15};//定义所要数组
+        double[] division1total=ExcelUtil.getDoubleArray(jzqd,BashInfo.DLJZ,2,comlumn2);//建筑分部分项比对数据清单合计
+        double[] division2total=ExcelUtil.getDoubleArray(jzqd,BashInfo.DLJZ,2,comlumn2);//安装分部分项比对数据清单合计
+        double[] division = {division1total[0],division1total[1],division2total[0],division2total[1]};
+        double feescount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
+        List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson);
         //数据核验并保存数据库
-//        settlementService.save(builtMap,builtTotal,divisiontotal,wordtotal,otherTotal,feescount,cbperson,id);
+        settlementService.save(dlSettlements,id);
         //获取补增值税税率调整差额和扣减甲供材超供材料费
         double wsbFees = ExcelUtil.getDouble(total, BashInfo.KJYJSG,1,2);
 //        double csFee = ExcelUtil.getDouble(gzhz,BashInfo.HZ_CH,1,2);  //措施项目费

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

@@ -31,8 +31,12 @@ public class SettlementService {
     /*
        查找结算工程
     */
-    public List<Settlement> selectSettlementService(String id){
-        return SettementUtil.getSelectSettlement(settlementMapper.selectSettlement(id));
+    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));
+        }
     }
 
     public void delete(String id){

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

@@ -604,7 +604,7 @@ public class SettementUtil {
                     if(money==divisiontotal[1]){
                         settlement.setStatus("0");
                     }
-                    settlement.setTheAmount(String.valueOf(divisionFbr+','+divisiontotal[1]+","+divisiontotal[3]));
+                    settlement.setTheAmount(String.valueOf(divisionFbr+","+divisiontotal[1]+","+divisiontotal[3]));
                     break;
                 case BashInfo.JS_JGJS:
                     double[] jgComparison = getJgjsComparison(settlements);
@@ -643,7 +643,7 @@ public class SettementUtil {
             key = settlement.getEntryName();
             switch (key){
                 case BashInfo.JS_FBFX:
-                    reason = getFbfxJoint(settlement);
+                    reason = getDJoint(settlement);
                     settlement.setReason(reason);
                     break;
                 case  BashInfo.JS_CBRF:
@@ -667,7 +667,7 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_FBRF:
-                    reason=getJoint(RESON_FBRF,RESON_FBRF1,settlement);
+                    reason=getDlJoint(settlement);
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_JGJS:
@@ -700,9 +700,10 @@ public class SettementUtil {
                 +"<br>"+SettementUtil.RESON_JZFBFX.replace("xxx",amout[2])
                 +"<br>"+SettementUtil.RESON_AZFBFX.replace("xxx",amout[3])
                 +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
-        String reason2=SettementUtil.RESON_FBFX2.replace("xxx",amout[0])+"<br>"+SettementUtil.RESON_FBFX3.replace("xxx",amout[1]);
-        String reason3=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(settlement.getMoney()))+"<br>"+SettementUtil.RESON_FBFX2.replace("xxx",amout[0]);
-        String reason4=SettementUtil.RESON_FBFX2.replace("xxx",amout[0])+"<br>"+SettementUtil.RESON_FBFX3.replace("xxx",amout[1]);
+        String reason2=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(settlement.getMoney()))
+                +"<br>"+SettementUtil.RESON_JZFBFX3.replace("xxx",amout[4])
+                +"<br>"+SettementUtil.RESON_AZFBFX3.replace("xxx",amout[5])
+                +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[1]);
         String status =settlement.getStatus();
         if(status.equals("0")){
             reason=reason1+"<br>"+SettementUtil.RESON_TRUE+"<br>"+reason2+"<br>"+SettementUtil.RESON_TRUE;
@@ -723,4 +724,22 @@ public class SettementUtil {
         }
         return reason;
     }
+    /*
+        电缆发包人对比
+     */
+    public static String getDlJoint(Settlement settlement){
+        String reason="";
+        String[] amout = settlement.getTheAmount().split(",");
+        String status=settlement.getStatus();
+        reason=RESON_FBRF.replace("xxx",String.valueOf(settlement.getMoney()))
+                +"<br>"+RESON_DLFBRF1.replace("xxx",amout[1])
+                +"<br>"+RESON_DLFBRF2.replace("xxx",amout[2])
+                +"<br>"+RESON_GCJS4.replace("xxx",amout[0]);
+        if (status.equals("0")){
+            reason+="<br>"+SettementUtil.RESON_TRUE;
+        }else {
+            reason+="<br>"+SettementUtil.RESON_FLASE;
+        }
+        return reason;
+    }
 }

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

@@ -95,7 +95,7 @@ public class OverheadLineController extends BaseController {
     //查询未识别数据
     List<JkxlAdjustFee> list2 = feeAdjustService.getTzFee(jkxlAdjustFee);
     //数据校验展示
-    List<Settlement> list3 = settlementService.selectSettlementService(id);
+    List<Settlement> list3 = settlementService.selectSettlementService(id,type);
     HashMap map = new HashMap();
     map.put("list1",list1);
     map.put("list",list);

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

@@ -98,13 +98,13 @@ public class ProjectController extends BaseController {
      *数据导入
      */
     @RequestMapping("/import")
-    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) {
+    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model)throws Exception {
         String projectName = request.getParameter("name");     //项目名称
         String projectId = request.getParameter("projectId");    //工程ID
         String type = request.getParameter("type");     //工程类型
         String id = getId();
         try {
-            //保存数据到数据库
+//            保存数据到数据库
             if(type.equals("1")) {
                 overheadLineService.saveJk(file, projectName, id, projectId, type);
             }