Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/entity/JkxlDetailFee.java

@@ -13,31 +13,23 @@ public class JkxlDetailFee {
     private Double originalCbrCost;  //分布分项前承包人采购费
     private Double originalFbrCost;  //分布分项前发包人采购费
     private Double originalJxCost;  //分部分项前机械费
-    private Double rgCost;  //分部分项调差后人工费
-    private Double cbrCost;  //分布分项调差后承包人采购费
-    private Double fbrCost;   //分布分项调差后发包人采购费
-    private Double jxCost;  //分布分项调差后发包人机械费
+//    private Double rgCost;  //分部分项调差后人工费
+//    private Double cbrCost;  //分布分项调差后承包人采购费
+//    private Double fbrCost;   //分布分项调差后发包人采购费
+//    private Double jxCost;  //分布分项调差后发包人机械费
     private Double measuresFee1;  //措施费一（1）
     private Double measuresFee2;  //措施费一（2）
     private Double measuresFee3;  //措施费二
     private Double otherCost;   //其他费用
     private Double fees;   //规费
     private Double tex;   //税金
-    private Double originalRate;  //总金额占比
     private Double rgFtFee;  //共性人工分摊费用
-    private Double cbrFtFee;  //共性承包人采购分摊费用
-    private Double fbrFtFee;   //共性发包人采购分摊费用
-    private Double jxFtFee;  //共性机械分摊费用
-    private Double gxFee;   //共性分摊费
     private Double totalFee;   //合计金额
 
     private String wbsId;  //标准 WBS 要素
     private String projectId;  //内部项目号
     private String describe;  //描述
     private String parentNode;  //父节点
-    private String mountMatter;   //挂接物料
-    private String mountServer;   //挂接服务
-    private String subjectAllocate;  //科目分配
     private String feeType;   //1：主体部分  2：其他部分
 
     private Double sbFee;      //设备费
@@ -69,21 +61,7 @@ public class JkxlDetailFee {
         this.jzFee = jzFee;
     }
 
-    public Double getGxFee() {
-        return gxFee;
-    }
-
-    public void setGxFee(Double gxFee) {
-        this.gxFee = gxFee;
-    }
 
-    public String getSubjectAllocate() {
-        return subjectAllocate;
-    }
-
-    public void setSubjectAllocate(String subjectAllocate) {
-        this.subjectAllocate = subjectAllocate;
-    }
 
     public String getFeeType() {
         return feeType;
@@ -102,22 +80,6 @@ public class JkxlDetailFee {
     }
 
 
-    public String getMountMatter() {
-        return mountMatter;
-    }
-
-    public void setMountMatter(String mountMatter) {
-        this.mountMatter = mountMatter;
-    }
-
-
-    public String getMountServer() {
-        return mountServer;
-    }
-
-    public void setMountServer(String mountServer) {
-        this.mountServer = mountServer;
-    }
 
 
     public String getWbsId() {
@@ -203,37 +165,7 @@ public class JkxlDetailFee {
         this.rgFtFee = rgFtFee;
     }
 
-    public Double getCbrFtFee() {
-        return cbrFtFee;
-    }
-
-    public void setCbrFtFee(Double cbrFtFee) {
-        this.cbrFtFee = cbrFtFee;
-    }
 
-    public Double getFbrFtFee() {
-        return fbrFtFee;
-    }
-
-    public void setFbrFtFee(Double fbrFtFee) {
-        this.fbrFtFee = fbrFtFee;
-    }
-
-    public Double getJxFtFee() {
-        return jxFtFee;
-    }
-
-    public void setJxFtFee(Double jxFtFee) {
-        this.jxFtFee = jxFtFee;
-    }
-
-    public Double getOriginalRate() {
-        return originalRate;
-    }
-
-    public void setOriginalRate(Double originalRate) {
-        this.originalRate = originalRate;
-    }
 
     public Double getOriginalRgCost() {
         return originalRgCost;
@@ -269,39 +201,6 @@ public class JkxlDetailFee {
     }
 
 
-    public Double getRgCost() {
-        return rgCost;
-    }
-
-    public void setRgCost(Double rgCost) {
-        this.rgCost = rgCost;
-    }
-
-    public Double getCbrCost() {
-        return cbrCost;
-    }
-
-    public void setCbrCost(Double cbrCost) {
-        this.cbrCost = cbrCost;
-    }
-
-    public Double getFbrCost() {
-        return fbrCost;
-    }
-
-    public void setFbrCost(Double fbrCost) {
-        this.fbrCost = fbrCost;
-    }
-
-
-
-    public Double getJxCost() {
-        return jxCost;
-    }
-
-    public void setJxCost(Double jxCost) {
-        this.jxCost = jxCost;
-    }
 
     public Double getMeasuresFee1() {
         return measuresFee1;

src/main/java/com/jeeplus/modules/sg/overheadline/entity/RuleRatio.java

@@ -1,40 +0,0 @@
-package com.jeeplus.modules.sg.overheadline.entity;
-
-public class RuleRatio {
-    private String id;   //ID
-    private String editionNo;  //版本号
-    private String ratioName;  //系数名称
-    private Double value;   //系数值（%）
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getEditionNo() {
-        return editionNo;
-    }
-
-    public void setEditionNo(String editionNo) {
-        this.editionNo = editionNo;
-    }
-
-    public String getRatioName() {
-        return ratioName;
-    }
-
-    public void setRatioName(String ratioName) {
-        this.ratioName = ratioName;
-    }
-
-    public Double getValue() {
-        return value;
-    }
-
-    public void setValue(Double value) {
-        this.value = value;
-    }
-}

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/RuleRatioMapper.java

@@ -1,9 +0,0 @@
-package com.jeeplus.modules.sg.overheadline.mapper;
-
-import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.sg.overheadline.entity.RuleRatio;
-
-@MyBatisMapper
-public interface RuleRatioMapper {
-    RuleRatio getValue(String ratioName);
-}

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/FeeAdjustMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jeeplus.modules.sg.overheadline.mapper.FeeAdjustMapper">
 
 	<select id="getTzFee" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlAdjustFee" resultType="com.jeeplus.modules.sg.overheadline.entity.JkxlAdjustFee">
-		select id,type,fee from sg_fee_adjust_jkxl
+		select id,type,fee from sg_fee_adjust
 		<where>
 			<if test="type != null and type != ''">
 				type = #{type} and
@@ -14,7 +14,7 @@
 	</select>
 
 	<update id="updateTzFee" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlAdjustFee">
-		update sg_fee_adjust_jkxl set fee = #{fee}
+		update sg_fee_adjust set fee = #{fee}
 		<where>
 			<if test="type != null and type != ''">
 				type = #{type} and
@@ -24,7 +24,7 @@
 	</update>
 
 	<insert id="saveTzFee" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlAdjustFee">
-		insert into sg_fee_adjust_jkxl
+		insert into sg_fee_adjust
 		(
 		 id,
 		 type,
@@ -37,7 +37,7 @@
 	</insert>
 
 	<delete id="delete" parameterType="String">
-		delete  from  sg_fee_adjust_jkxl
+		delete  from  sg_fee_adjust
 		<where>
 			id = #{id}
 		</where>

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/OverheadLineMapper.xml

@@ -15,10 +15,6 @@
          b.original_cbr_cost as originalCbrCost,
          b.original_fbr_cost as originalFbrCost,
          b.original_jx_cost as originalJxCost,
-         b.rg_cost as rgCost,
-         b.cbr_cost as cbrCost,
-         b.fbr_cost as fbrCost,
-         b.jx_cost as jxCost,
          b.measures_fee1 as measuresFee1,
          b.measures_fee2 as measuresFee2,
 		 b.measures_fee3 as measuresFee3,
@@ -27,13 +23,8 @@
          b.fees as fees,
          b.zjgc_fee as zjgcFee,
          b.total_fee as totalFee,
-         b.original_rate as originalRate,
-         b.rg_fee_ft as rgFtFee,
-         b.cbr_fee_ft as cbrFtFee,
-         b.fbr_fee_ft as fbrFtFee,
-         b.jx_fee_ft as jxFtFee,
-         b.gx_fee as gxFee
-         FROM sg_wbs_elements a LEFT JOIN sg_fee_detail_jkxl b on a.short_id = b.wbs_code
+         b.rg_fee_ft as rgFtFee
+         FROM sg_wbs_elements a LEFT JOIN sg_fee_detail b on a.short_id = b.wbs_code
          and b.id = #{id}
          <where>
 			 a.state = '1' and project_type = #{type}
@@ -53,10 +44,6 @@
          b.original_cbr_cost as originalCbrCost,
          b.original_fbr_cost as originalFbrCost,
          b.original_jx_cost as originalJxCost,
-         b.rg_cost as rgCost,
-         b.cbr_cost as cbrCost,
-         b.fbr_cost as fbrCost,
-         b.jx_cost as jxCost,
          b.measures_fee1 as measuresFee1,
          b.measures_fee2 as measuresFee2,
 		 b.measures_fee3 as measuresFee3,
@@ -65,12 +52,8 @@
          b.fees as fees,
          b.zjgc_fee as zjgcFee,
          b.total_fee as totalFee,
-         b.original_rate as originalRate,
-         b.rg_fee_ft   as rgFtFee,
-         b.cbr_fee_ft  as cbrFtFee,
-         b.fbr_fee_ft  as fbrFtFee,
-         b.jx_fee_ft as jxFtFee
-         FROM sg_wbs_elements a LEFT JOIN sg_fee_detail_jkxl b on a.short_id = b.wbs_code
+         b.rg_fee_ft   as rgFtFee
+         FROM sg_wbs_elements a LEFT JOIN sg_fee_detail b on a.short_id = b.wbs_code
          <where>
          b.id = #{id}  and a.short_id = #{wbsCode}
 		 </where>
@@ -91,10 +74,6 @@
 		b.original_cbr_cost as originalCbrCost,
 		b.original_fbr_cost as originalFbrCost,
 		b.original_jx_cost as originalJxCost,
-		b.rg_cost as rgCost,
-		b.cbr_cost as cbrCost,
-		b.fbr_cost as fbrCost,
-		b.jx_cost as jxCost,
 		b.measures_fee1 as measuresFee1,
 		b.measures_fee2 as measuresFee2,
 		b.measures_fee3 as measuresFee3,
@@ -103,7 +82,7 @@
 		b.fees as fees,
 		b.zjgc_fee as zjgcFee,
          b.total_fee as totalFee
-         FROM sg_wbs_elements a LEFT JOIN sg_fee_detail_jkxl b on a.short_id = b.wbs_code
+         FROM sg_wbs_elements a LEFT JOIN sg_fee_detail b on a.short_id = b.wbs_code
          and b.id = #{id}
          <!--<where>-->
 			 <!--<if test="type != ''">-->
@@ -118,7 +97,7 @@
 		a.simple_describe as 'describe',
 		a.parent_node as parentNode,
 		a.short_id as wbsCode
-		FROM sg_wbs_elements a LEFT JOIN sg_fee_detail_jkxl b on a.short_id = b.wbs_code
+		FROM sg_wbs_elements a LEFT JOIN sg_fee_detail b on a.short_id = b.wbs_code
 		<where>
 			b.id = #{id} and b.original_total_cost is not null
 		</where>
@@ -126,19 +105,14 @@
 
 
 	<insert id="save" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">
-		insert into sg_fee_detail_jkxl
+		insert into sg_fee_detail
 		(id,
 		 wbs_code,
 		 original_total_cost,
-		 original_rate,
 		 original_rg_cost,
 		 original_cbr_cost,
 		 original_fbr_cost,
 		 original_jx_cost,
-		 rg_cost,
-		 cbr_cost,
-		 fbr_cost,
-		 jx_cost,
 		 measures_fee1,
 		 measures_fee2,
 		 measures_fee3,
@@ -146,25 +120,15 @@
 		 fees,
 		 tex,
 		 total_fee,
-		 zjgc_fee,
-		 rg_fee_ft,
-		 cbr_fee_ft,
-		 fbr_fee_ft,
-		 jx_fee_ft,
-		 gx_fee
+		 zjgc_fee
 		) values (
 		 #{id},
 		 #{wbsCode},
 		 #{originalTotalCost},
-		 #{originalRate},
 		 #{originalRgCost},
 		 #{originalCbrCost},
 		 #{originalFbrCost},
 		 #{originalJxCost},
-		 #{rgCost},
-		 #{cbrCost},
-		 #{fbrCost},
-		 #{jxCost},
 		 #{measuresFee1},
 		 #{measuresFee2},
 		 #{measuresFee3},
@@ -172,29 +136,19 @@
 		 #{fees},
 		 #{tex},
 		 #{totalFee},
-		 #{zjgcFee},
-		 #{rgFtFee},
-		 #{cbrFtFee},
-		 #{fbrFtFee},
-		 #{jxFtFee},
-		 #{gxFee}
+		 #{zjgcFee}
 		)
 	</insert>
 
 	<insert id="saveList" parameterType="java.util.List">
-		insert into sg_fee_detail_jkxl
+		insert into sg_fee_detail
 		(id,
 		 wbs_code,
 		 original_total_cost,
-		 original_rate,
 		 original_rg_cost,
 		 original_cbr_cost,
 		 original_fbr_cost,
 		 original_jx_cost,
-		 rg_cost,
-		 cbr_cost,
-		 fbr_cost,
-		 jx_cost,
 		 measures_fee1,
 		 measures_fee2,
 		 measures_fee3,
@@ -202,27 +156,17 @@
 		 fees,
 		 tex,
 		 total_fee,
-		 zjgc_fee,
-		 rg_fee_ft,
-		 cbr_fee_ft,
-		 fbr_fee_ft,
-		 jx_fee_ft,
-		 gx_fee
+		 zjgc_fee
 		) values
 		<foreach collection="list" item="item" index="index" separator=",">
 		 (
 		 #{item.id},
 		 #{item.wbsCode},
 		 #{item.originalTotalCost},
-		 #{item.originalRate},
 		 #{item.originalRgCost},
 		 #{item.originalCbrCost},
 		 #{item.originalFbrCost},
 		 #{item.originalJxCost},
-		 #{item.rgCost},
-		 #{item.cbrCost},
-		 #{item.fbrCost},
-		 #{item.jxCost},
 		 #{item.measuresFee1},
 		 #{item.measuresFee2},
 		 #{item.measuresFee3},
@@ -230,12 +174,7 @@
 		 #{item.fees},
 		 #{item.tex},
 		 #{item.totalFee},
-		 #{item.zjgcFee},
-		 #{item.rgFtFee},
-		 #{item.cbrFtFee},
-		 #{item.fbrFtFee},
-		 #{item.jxFtFee},
-		 #{item.gxFee}
+		 #{item.zjgcFee}
 		)
 		</foreach>
 	</insert>
@@ -244,7 +183,7 @@
 
     <update id="updateList" parameterType="java.util.List">
 		<foreach collection="list" item="item" index="index" separator=";">
-          update sg_fee_detail_jkxl set
+          update sg_fee_detail set
 			     rg_fee_ft = #{item.rgFtFee},
 				 total_fee = #{item.totalFee}
           <where>
@@ -254,37 +193,10 @@
     </update>
 
 	<update id="updateDate" parameterType="com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee">
-		update sg_fee_detail_jkxl set
+		update sg_fee_detail set
 		<if test="rgFtFee != null and rgFtFee != ''">
 			rg_fee_ft = #{rgFtFee},
 		</if>
-		<if test="cbrFtFee != null and cbrFtFee != ''">
-			cbr_fee_ft = #{cbrFtFee},
-		</if>
-		<if test="fbrFtFee != null and fbrFtFee != ''">
-			fbr_fee_ft =  #{fbrFtFee},
-		</if>
-		<if test="jxFtFee != null and jxFtFee != ''">
-			jx_fee_ft =  #{jxFtFee},
-		</if>
-		<if test="measuresFee1 != null and measuresFee1 != ''">
-			measures_fee1 = #{measuresFee1},
-		</if>
-		<if test="measuresFee2 != null and measuresFee2 != ''">
-			measures_fee2 = #{measuresFee2},
-		</if>
-		<if test="measuresFee3 != null and measuresFee3 != ''">
-			measures_fee3 = #{measuresFee3},
-		</if>
-		<if test="otherCost != null and otherCost != ''">
-			other_cost = #{otherCost},
-		</if>
-		<if test="fees != null and fees != ''">
-			fees = #{fees},
-		</if>
-		<if test="tex != null and tex != ''">
-			tex = #{tex},
-		</if>
 		<if test="totalFee != null and totalFee != ''">
 			total_fee = #{totalFee},
 		</if>
@@ -297,7 +209,7 @@
 
 
 	<delete id="delete" parameterType="String">
-		delete  from  sg_fee_detail_jkxl
+		delete  from  sg_fee_detail
 		<where>
 			id = #{id}
 		</where>

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/RuleRatioMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeeplus.modules.sg.overheadline.mapper.RuleRatioMapper">
-	<select id="getValue" parameterType="String" resultType="com.jeeplus.modules.sg.overheadline.entity.RuleRatio">
-		select value from sg_rule_ratio
-		<where>
-			ratio_name = #{ratioName}
-		</where>
-	</select>
-
-</mapper>

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

@@ -21,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
@@ -31,8 +30,6 @@ public class OverheadLineService {
     @Autowired
     private FeeAdjustService feeAdjustService;
     @Autowired
-    private RuleRatioService ruleRatioService;
-    @Autowired
     private SettlementService settlementService;
     @Autowired
     private ItemService itemService;
@@ -69,7 +66,7 @@ public List<JkxlDetailFee> findList(String id,String type){
     double az2 = 0.00;
     double qtTotal = 0.00;
     //变电站导出
-    if(type.equals("3")) {
+    if(type.equals(BashInfo.PROJECT_BDZ)) {
         for (JkxlDetailFee jkxlDetailFee : list) {
             if (jkxlDetailFee.getWbsCode().equals("21000000")) {
                 jz1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
@@ -102,7 +99,7 @@ public List<JkxlDetailFee> findList(String id,String type){
         }
     }
     //电缆导出
-    if(type.equals("2")){
+    if(type.equals(BashInfo.PROJECT_DLXL)){
         for (JkxlDetailFee jkxlDetailFee : list) {
             String wbs = jkxlDetailFee.getWbsCode().substring(0,3);
             String wbs1 = jkxlDetailFee.getWbsCode().substring(3,4);
@@ -152,7 +149,7 @@ public List<JkxlDetailFee> findList(String id,String type){
 
     }
     //架空导出
-    if(type.equals("1")) {
+    if(type.equals(BashInfo.PROJECT_JKXL)) {
         for (JkxlDetailFee jkxlDetailFee : list) {
             //本体费用求和
             if (jkxlDetailFee.getOriginalTotalCost() != null) {
@@ -215,22 +212,12 @@ public List<JkxlDetailFee> findList(String id,String type){
     @Transactional(readOnly = false)
    public void saveJk(MultipartFile file,WbsItem wbsItem) throws IOException, InvalidFormatException {
        String id = wbsItem.getId();
-       String type = wbsItem.getType();
        WbsItem wbsItem1 = itemService.get(id);
        if(wbsItem1 == null){
            wbsItem.setDelFlag("0");
            //保存项目
            itemService.save(wbsItem);
        }
-//       List<JkxlDetailFee> jkxlDetailFees = overheadLineMapper.findList(id,type);
-//       if(jkxlDetailFees != null && jkxlDetailFees.size()>0){
-//           overheadLineMapper.delete(id);
-//           feeAdjustService.delete(id);
-//           settlementService.delete(id);
-//       }
-       //获取调差系数
-//       double[] tcRate = new double[3];
-//       tcRate[0] = ruleRatioService.getValueByName(BashInfo.RATIO_RGTC).getValue()/100;
        //读取表格
        ImportExcel importExcel = new ImportExcel(file,1,BashInfo.SHEET_FBFXJJ,true);  //分部分项工程量清单计价表
        ImportExcel csqd = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CSB,BashInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
@@ -245,14 +232,11 @@ public List<JkxlDetailFee> findList(String id,String type){
         //数据核验数据
         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 =  BashInfo.getJkCs(csqd);//获取措施费清单计价表一
        double otherTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
         double cbperson =  0.0;
        double[] divisiontotal=ExcelUtil.getDoubleArray(importExcel,BashInfo.PROJECTNAME,2,new int[]{12,15});//获取分部分项比对数据清单
-//        divisiontotal[0] = divisiontotal[0]+csxmHj;
-        double gfFees = BashInfo.getJkGf(gf); //规费
-//       double feescount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
+        double gfFees = BashInfo.getJkGf(gf); //规费合计
        //数据核验并保存数据库
         double wordtotal2 =  0.0;  //措施费二合计
         if(ImportExcel.getSheet(csqd2) != null){
@@ -286,7 +270,6 @@ public List<JkxlDetailFee> findList(String id,String type){
        double zg = zjgcTotal-(aqwmFees[1]/(aqwmFees[0]/100));
        double jxsl = zg/(fbrFee-zg); //进项税率
        double csFees = BashInfo.getCsFee(csqd); //安装措施费
-//       double gfFees = ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4); //规费
 
        //结算汇总
         List<Settlement> settlements=SettementUtil.getComparison(settlementList,builtTotal,divisiontotal,wordtotal1,wordtotal2,otherTotal,gfFees,cbperson);
@@ -318,7 +301,6 @@ public List<JkxlDetailFee> findList(String id,String type){
            double zjgcFee = zjgcFees[i];//直接工程费
            double originalRgCost = originalFees[i][0];// 原人工费
            double rgfRate = originalRgCost/totalRgFee; //人工费比例
-//           double rgCost = originalRgCost/(1+tcRate[0]);  //后人工费
            double originalCbrCost = originalFees[i][1];  //原承包人采购
            double originalFbrCost = originalFees[i][2];  //原发包人采购
            double fbrCost = originalFbrCost/(1+jxsl); //后发包人采购
@@ -337,12 +319,10 @@ public List<JkxlDetailFee> findList(String id,String type){
                 totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
            }
            jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
-           jkxlDetailFee.setOriginalRate(orRate);
            jkxlDetailFee.setOriginalRgCost(originalRgCost);
 //           jkxlDetailFee.setRgCost(rgCost);
            jkxlDetailFee.setOriginalCbrCost(originalCbrCost);
            jkxlDetailFee.setOriginalFbrCost(originalFbrCost);
-           jkxlDetailFee.setFbrCost(fbrCost);
            jkxlDetailFee.setOriginalJxCost(originalJxrCost);
            jkxlDetailFee.setMeasuresFee1(measuresFee1);
            jkxlDetailFee.setMeasuresFee2(measuresFee2);
@@ -503,15 +483,6 @@ public List<JkxlDetailFee> findList(String id,String type){
             //保存项目
             itemService.save(wbsItem);
         }
-//        List<JkxlDetailFee> jkxlDetailFees = overheadLineMapper.findList(id,type);
-//        if(jkxlDetailFees != null && jkxlDetailFees.size()>0){
-//            overheadLineMapper.delete(id);
-//            feeAdjustService.delete(id);
-//            settlementService.delete(id);
-//        }
-        //获取调差系数
-//        double[] tcRate = new double[3];
-//        tcRate[0] = ruleRatioService.getValueByName(BashInfo.RATIO_RGTC).getValue()/100;
         //读取表格
         ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2,BashInfo.SHEET_HZB3},true );  //工程项目竣工结算汇总表
         ImportExcel csqd = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CSB,BashInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
@@ -521,11 +492,10 @@ public List<JkxlDetailFee> findList(String id,String type){
 //        ImportExcel fbrcg = new ImportExcel(file,1,new String[]{BashInfo.SHEET_FBRCG,BashInfo.SHEET_FBRCG1,BashInfo.SHEET_FBRCG2,BashInfo.SHEET_ZBRCG,BashInfo.SHEET_ZBRCG1},true);   //发包人采购材料设备计价表
         ImportExcel cbrsb = new ImportExcel(file,1,new String[]{BashInfo.SHEET_TBRCG,BashInfo.SHEET_CBRCG},false);//承包人采购设备计价表
         List<Settlement> settlementList =  SettementUtil.getComparison(total);
-        double cbperson = 0.0;
+        double cbperson = 0.0;  //承包人采购设备费
         //措施费合计
-        double jzcs = BashInfo.getJzCs(csqd);
-        double azcs = BashInfo.getAzCs(csqd);
-//        double word1total =  ExcelUtil.getDouble(csqd,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double jzcs = BashInfo.getJzCs(csqd); //建筑措施费合计
+        double azcs = BashInfo.getAzCs(csqd);  //安装措施费合计
         double word1total = jzcs+azcs;//获取措施费清单计价表一
         double word2total=0.0; //清单表措施费二合计
         if(ImportExcel.getSheet(csqd2) != null){
@@ -711,7 +681,6 @@ public List<JkxlDetailFee> findList(String id,String type){
                 }
                 jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
                 jkxlDetailFee.setOriginalRgCost(originalRgCost);
-//                jkxlDetailFee.setRgCost(rgCost);
                 jkxlDetailFee.setOriginalCbrCost(originalCbrCost);
                 jkxlDetailFee.setOriginalFbrCost(originalFbrCost);
                 jkxlDetailFee.setOriginalJxCost(originalJxrCost);
@@ -821,7 +790,6 @@ public List<JkxlDetailFee> findList(String id,String type){
                 }
                 jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
                 jkxlDetailFee.setOriginalRgCost(originalRgCost);
-//                jkxlDetailFee.setRgCost(rgCost);
                 jkxlDetailFee.setOriginalCbrCost(originalCbrCost);
                 jkxlDetailFee.setOriginalFbrCost(originalFbrCost);
                 jkxlDetailFee.setOriginalJxCost(originalJxrCost);
@@ -864,7 +832,6 @@ public List<JkxlDetailFee> findList(String id,String type){
                 }
                 jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
                 jkxlDetailFee.setOriginalRgCost(originalRgCost);
-//                jkxlDetailFee.setRgCost(rgCost);
                 jkxlDetailFee.setOriginalCbrCost(originalCbrCost);
                 jkxlDetailFee.setOriginalFbrCost(originalFbrCost);
                 jkxlDetailFee.setOriginalJxCost(originalJxrCost);
@@ -947,7 +914,6 @@ public List<JkxlDetailFee> findList(String id,String type){
         double cstotal2 = 0.00;
         double cstotal3 = 0.00;
         double gftotal = 0.00;
-//        double textotal = 0.00;
         double zjgcTotal = 0.00;
         for(JkxlDetailFee jkxlDetailFee2 :list){
             cstotal1 += jkxlDetailFee2.getMeasuresFee1();
@@ -965,7 +931,6 @@ public List<JkxlDetailFee> findList(String id,String type){
             if(gftotal != 0.00) {
                 gfRate = jkxlDetailFee1.getFees() / gftotal;
             }
-            double ftRate = jkxlDetailFee1.getZjgcFee()/zjgcTotal;
             double csft = (jsCs-(cstotal1+cstotal2+cstotal3))*csftRate;
             double gfft = (jsGf-gftotal)*gfRate;
             double sgft = (csft+gfft)*texRate;
@@ -1034,15 +999,6 @@ public List<JkxlDetailFee> findList(String id,String type){
             //保存项目
             itemService.save(wbsItem);
         }
-//        List<JkxlDetailFee> jkxlDetailFees = overheadLineMapper.findList(id,type);
-//        if(jkxlDetailFees != null && jkxlDetailFees.size()>0){
-//            overheadLineMapper.delete(id);
-//            feeAdjustService.delete(id);
-//            settlementService.delete(id);
-//        }
-        //获取调差系数
-//        double[] tcRate = new double[3];
-//        tcRate[0] = ruleRatioService.getValueByName(BashInfo.RATIO_RGTC).getValue()/100;
         //读取表格
         ImportExcel total = new ImportExcel(file,1,new String[]{BashInfo.SHEET_HZB,BashInfo.SHEET_HZB1,BashInfo.SHEET_HZB2},true );  //工程项目竣工结算汇总表
         ImportExcel csqd = new ImportExcel(file,1,new String[]{BashInfo.SHEET_CSB,BashInfo.SHEET_CSB1},true);  // 措施项目清单计价表（一）
@@ -1129,8 +1085,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                 double originalJxrCost = originalJzFees[i][3];   //原机械费
                 double rate = (zjgcJzFee-originalFbrCost)/(zjgcJzTotal-fbrJzFee); //比例
                 double measuresFee1 = (zjgcJzFee-originalFbrCost/(1+jxslJz)*jxslJz)*csJzFee[0]+csJzFee[1]*rate; //措施费一（1）
-//                double measuresFee1 = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzcsRate; //措施费一（2）
-                double measuresFee2 = 0.00;   //措施费一（1）
+                double measuresFee2 = 0.00;   //措施费一（2）
                 double measuresFee3 = csFees2*originalTotalCost/fbfxFee; //措施费二
                 double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[0]+(zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*jzgfRate[1]*0.2;  //规费
                 if(f){
@@ -1141,9 +1096,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax; //合计
                 }
                 jkxlDetailFee.setOriginalTotalCost(originalTotalCost);
-//            jkxlDetailFee.setOriginalRate(orRate);
                 jkxlDetailFee.setOriginalRgCost(originalRgCost);
-//                jkxlDetailFee.setRgCost(rgCost);
                 jkxlDetailFee.setOriginalCbrCost(originalCbrCost);
                 jkxlDetailFee.setOriginalFbrCost(originalFbrCost);
                 jkxlDetailFee.setOriginalJxCost(originalJxrCost);
@@ -1426,7 +1379,6 @@ public List<JkxlDetailFee> findList(String id,String type){
             if(gftotal != 0.00) {
                 gfRate = jkxlDetailFee1.getFees() / gftotal;
             }
-            double ftRate = jkxlDetailFee1.getZjgcFee()/zjgcTotal;
             double csft = (jsCs-(cstotal1+cstotal2+cstotal3))*csftRate;
             double gfft = (jsGf-gftotal)*gfRate;
             double sgft = (csft+gfft)*texRate;

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

@@ -1,19 +0,0 @@
-package com.jeeplus.modules.sg.overheadline.service;
-
-import com.jeeplus.modules.sg.overheadline.entity.RuleRatio;
-import com.jeeplus.modules.sg.overheadline.mapper.RuleRatioMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RuleRatioService {
-    @Autowired
-    private RuleRatioMapper ruleRatioMapper;
-
-
-   public RuleRatio getValueByName(String ratioName){
-       return ruleRatioMapper.getValue(ratioName);
-   }
-
-
-}

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

@@ -11,6 +11,10 @@ import java.util.List;
 import java.util.Map;
 
 public class BashInfo {
+    public static final String PROJECT_JKXL = "1"; //架空线路项目类型编号
+    public static final String PROJECT_DLXL = "2"; //电缆线路项目类型编号
+    public static final String PROJECT_BDZ = "3"; //变电站项目类型编号
+
     public static final String PROJECTNAME = "架空线路";
     public static final String SHEET_FBFXJJ = "分部分项工程量清单计价表";
     public static final String SHEET_HZB = "工程项目竣工结算汇总表";
@@ -63,11 +67,6 @@ public class BashInfo {
     public static final String MX_GDGL= "4 管道光缆线路／音频电缆线路";
 
 
-
-    public static final String RATIO_RGTC = "人工调差系数";
-    public static final String RATIO_CLTC = "材料调差系数";
-    public static final String RATIO_JXTC = "机械调差系数";
-
     public static final String CS_LS = "临时设施费";
     public static final String CS_AQWM = "安全文明施工费";
     public static final String GF_WXZY = "危险作业意外伤害保险费";
@@ -76,9 +75,6 @@ public class BashInfo {
     public static final String QT_CBRSB = "承包人采购设备费";
     public static final String QT_HJ = "合计";
     public static final String QT_XJ = "小计";
-    public static final String BZZSSL = "补增值税税率调整差额";
-    public static final String KJJGCC = "扣减甲供材超供材料费";
-    public static final String KJYJSG = "扣夜间施工增加费";
     public static final String CSXM2 = "措施项目（二）";
     public static final String GCJS = "工程结算价";
     public static final String TBJG = "竣工结算价合计";
@@ -150,8 +146,6 @@ public class BashInfo {
     public static final String JS_SJ="税金";
     public static final String JS_FBRF="发包人采购材料费";
     public static final String JS_JGJS="竣工结算价合计";
-    public static final String JS_BZZS="补增值税税率调整差额";
-    public static final String JS_KJJG="扣减甲供材超供材料费";
     public static final String JS_GCJS="工程结算价";
 
     public static final String INVALIDFORMAT = "文件格式错误";

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

@@ -9,7 +9,6 @@ import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.overheadline.entity.*;
 import com.jeeplus.modules.sg.overheadline.service.FeeAdjustService;
 import com.jeeplus.modules.sg.overheadline.service.OverheadLineService;
-import com.jeeplus.modules.sg.overheadline.service.RuleRatioService;
 import com.jeeplus.modules.sg.overheadline.service.SettlementService;
 import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
@@ -113,7 +112,7 @@ public class OverheadLineController extends BaseController {
         double size = jkxlDetailFees.size();
         //直接工程费
         if(code.equals(BashInfo.TZ_ZJGC)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -152,7 +151,7 @@ public class OverheadLineController extends BaseController {
         }
         //人工费
         if(code.equals(BashInfo.TZ_RGF)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -191,7 +190,7 @@ public class OverheadLineController extends BaseController {
         }
         //承包人采购
         if(code.equals(BashInfo.TZ_CBRCG)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -230,7 +229,7 @@ public class OverheadLineController extends BaseController {
         }
         //发包人采购
         if(code.equals(BashInfo.TZ_FBRCG)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -269,7 +268,7 @@ public class OverheadLineController extends BaseController {
         }
         //机械费
         if(code.equals(BashInfo.TZ_JX)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -308,7 +307,7 @@ public class OverheadLineController extends BaseController {
         }
         //措施费一（1）
         if(code.equals(BashInfo.TZ_CSF1)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -347,7 +346,7 @@ public class OverheadLineController extends BaseController {
         }
         //措施费一（2）
         if(code.equals(BashInfo.TZ_CSF2)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -386,7 +385,7 @@ public class OverheadLineController extends BaseController {
         }
         //措施费二
         if(code.equals(BashInfo.TZ_CSF3)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -425,7 +424,7 @@ public class OverheadLineController extends BaseController {
         }
         //其他费
         if(code.equals(BashInfo.TZ_QTF)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -464,7 +463,7 @@ public class OverheadLineController extends BaseController {
         }
         //规费
         if(code.equals(BashInfo.TZ_GF)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -503,7 +502,7 @@ public class OverheadLineController extends BaseController {
         }
         //税费
         if(code.equals(BashInfo.TZ_SF)){
-          if(itemType.equals("3")){
+          if(itemType.equals(BashInfo.PROJECT_BDZ)){
             double totalJz = 0.00;
             double totalAz = 0.00;
             for(JkxlDetailFee jkxlDetailFee : jkxlDetailFees) {
@@ -563,22 +562,12 @@ public class OverheadLineController extends BaseController {
     WbsItem wbsItem = itemService.get(id);
     String type = wbsItem.getType();
     List<JkxlDetailFee> list = overheadLineService.getAdjust(id);
-    if(type.equals("3")){
+    if(type.equals(BashInfo.PROJECT_BDZ)){
       JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
       jkxlDetailFee.setParentNode("-1");
       jkxlDetailFee.setDescribe("变电站工程");
       jkxlDetailFee.setWbsCode("20000000");
       list.add(jkxlDetailFee);
-//      for(JkxlDetailFee jkxlDetailFee1 : list){
-//        for(JkxlDetailFee jkxlDetailFee2 : list){
-//          if(jkxlDetailFee1.getParentNode().equals(jkxlDetailFee2.getWbsCode())){
-//            jkxlDetailFee1.setFeeType("1");
-//            break;
-//          } else {
-//            jkxlDetailFee1.setFeeType("2");
-//          }
-//        }
-//      }
       model.addAttribute("list",list);
       return "modules/sg/free/individualForm";
     }
@@ -730,19 +719,6 @@ public class OverheadLineController extends BaseController {
 
 
 
-//    /**
-//     * 创建项目ID
-//     */
-//  public String getId() {
-//     SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss");
-//     String newDate=sdf.format(new Date());
-//     String result="";
-//      Random random=new Random();
-//     for(int i=0;i<3;i++){
-//       result+=random.nextInt(10);
-//     }
-//     return newDate+result;
-// }
 
 
   /**
@@ -764,7 +740,7 @@ public class OverheadLineController extends BaseController {
       }
     }
     //变电站项目求和
-    if(type.equals("3")){
+    if(type.equals(BashInfo.PROJECT_BDZ)){
       double[][] zFees = new double[22][2];
        for(JkxlDetailFee jkxlDetailFee : list){
           if(jkxlDetailFee.getWbsCode().equals("21000000")){
@@ -781,6 +757,7 @@ public class OverheadLineController extends BaseController {
             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;
           }
          if(jkxlDetailFee.getWbsCode().equals("23000000")){
@@ -797,6 +774,7 @@ public class OverheadLineController extends BaseController {
            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;
          }
        }
@@ -814,7 +792,7 @@ public class OverheadLineController extends BaseController {
       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.setGxFee(new BigDecimal(zFee[20]).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.setWbsCode("合计");
       jkxlDetailFee.setParentNode("20000000");
@@ -846,22 +824,18 @@ public class OverheadLineController extends BaseController {
       zFee[3] += jkxlDetailFee.getOriginalCbrCost();
       zFee[4] += jkxlDetailFee.getOriginalFbrCost();
       zFee[5] += jkxlDetailFee.getOriginalJxCost();
-//      zFee[6] += jkxlDetailFee.getRgCost();
       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.getGxFee();
+      zFee[20] += jkxlDetailFee.getRgFtFee()!=null? jkxlDetailFee.getRgFtFee():0.00;
       zFee[21] += jkxlDetailFee.getTotalFee();
     }
     JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
     JkxlDetailFee jkxlDetailFee1 = new JkxlDetailFee();
-    java.text.NumberFormat NF = java.text.NumberFormat.getInstance();
-    NF.setGroupingUsed(false);//去掉科学计数法显示
-//    jkxlDetailFee.setOriginalTotalCost(new BigDecimal(NF.format(zFee[0])).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setOriginalTotalCost(Double.valueOf(NF.format(zFee[0])));
+    jkxlDetailFee.setOriginalTotalCost(new BigDecimal(zFee[0]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setZjgcFee(new BigDecimal(zFee[1]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalRgCost(new BigDecimal(zFee[2]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
     jkxlDetailFee.setOriginalCbrCost(new BigDecimal(zFee[3]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
@@ -874,24 +848,24 @@ public class OverheadLineController extends BaseController {
     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.setGxFee(new BigDecimal(zFee[20]).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-    jkxlDetailFee.setTotalFee(new BigDecimal(NF.format(zFee[21])).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.setWbsCode("合计");
-    if(type.equals("1")) {
+    if(type.equals(BashInfo.PROJECT_JKXL)) {
       jkxlDetailFee.setParentNode("30000000");
     }
-    if(type.equals("2")) {
+    if(type.equals(BashInfo.PROJECT_DLXL)) {
       jkxlDetailFee.setParentNode("40000000");
     }
-    jkxlDetailFee.setFeeType("1");
-    jkxlDetailFee1.setWbsCode("合计");
-    if(type.equals("1")) {
+    jkxlDetailFee.setFeeType("1"); //1:本体部分  0,其他部分
+    jkxlDetailFee1.setWbsCode(BashInfo.QT_HJ);
+    if(type.equals(BashInfo.PROJECT_JKXL)) {
       jkxlDetailFee1.setParentNode("34000000");
     }
-    if(type.equals("2")) {
+    if(type.equals(BashInfo.PROJECT_DLXL)) {
       jkxlDetailFee1.setParentNode("44000000");
     }
-    jkxlDetailFee1.setFeeType("0");
+    jkxlDetailFee1.setFeeType("0");//1:本体部分  0,其他部分
     jkxlDetailFee1.setTotalFee(total1);
     List<JkxlDetailFee> list3 = new ArrayList<>();
     list3.add(jkxlDetailFee);
@@ -918,7 +892,7 @@ public class OverheadLineController extends BaseController {
       }
     }
     for (JkxlDetailFee jkxlDetailFee : list){
-      if(jkxlDetailFee.getWbsCode().equals("合计") && jkxlDetailFee.getOriginalTotalCost() != null){
+      if(jkxlDetailFee.getWbsCode().equals(BashInfo.QT_HJ) && jkxlDetailFee.getOriginalTotalCost() != null){
            originalTotal  =   jkxlDetailFee.getOriginalTotalCost();  //分部分项合计
            otherCost = jkxlDetailFee.getOtherCost();     //其他费用
            measuresFee = jkxlDetailFee.getMeasuresFee1()+jkxlDetailFee.getMeasuresFee2()+jkxlDetailFee.getMeasuresFee3();   //措施费
@@ -928,7 +902,7 @@ public class OverheadLineController extends BaseController {
            originalFbrCost = jkxlDetailFee.getOriginalFbrCost();  //发包人合计
            originalCbrCost = jkxlDetailFee.getOriginalCbrCost();   //承包人合计
       }
-      if(jkxlDetailFee.getWbsCode().equals("合计") && jkxlDetailFee.getOriginalTotalCost() == null){
+      if(jkxlDetailFee.getWbsCode().equals(BashInfo.QT_HJ) && jkxlDetailFee.getOriginalTotalCost() == null){
          qt = jkxlDetailFee.getTotalFee();
       }
     }
@@ -938,11 +912,6 @@ public class OverheadLineController extends BaseController {
         settlement.setTotalFee(originalTotal);
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
-//      if(settlement.getEntryName().contains("承包人") || settlement.getEntryName().contains("投标人")){
-//        double ce = Math.abs(settlement.getMoney() - originalCbrCost);
-//        settlement.setTotalFee(originalCbrCost);
-//        settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-//      }
       if(settlement.getEntryName().contains("发包人") || settlement.getEntryName().contains("招标人")){
         double ce = Math.abs(settlement.getMoney() - originalFbrCost);
         settlement.setTotalFee(originalFbrCost);
@@ -969,7 +938,6 @@ public class OverheadLineController extends BaseController {
         settlement.setDifference(new BigDecimal(ce).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }
       if(settlement.getEntryName().contains("结算") || settlement.getEntryName().contains("报价") || settlement.getEntryName().contains("下浮后") || settlement.getEntryName().contains("最高")){
-//        double ce = Math.abs(settlement.getMoney() - totalFee);
         settlement.setTotalFee(totalFee);
         settlement.setDifference(new BigDecimal(ce1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
       }

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

@@ -11,10 +11,8 @@
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
 		a.item_name AS "itemName",
-		a.item_no AS "itemNo",
 		a.unit AS "unit",
 	    a.project_id AS "projectId",
-		a.parent_node AS "parentNode",
 		a.type AS "type"
 	</sql>
 
@@ -95,10 +93,8 @@
 			del_flag,
 			item_name,
 			unit,
-			item_no,
 			type,
-			project_id,
-			parent_node
+			project_id
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -109,10 +105,8 @@
 			#{delFlag},
 			#{itemName},
 			#{unit},
-			#{itemNo},
 			#{type},
-			#{projectId},
-			#{parentNode}
+			#{projectId}
 		)
 	</insert>
 	
@@ -153,7 +147,6 @@
 		unit AS unit,
 		item_name AS itemName,
 		project_id AS projectId,
-		parent_node AS parentNode,
 		create_date AS createDate
 		FROM sg_wbs_item
 		WHERE item_name = #{itemName} and project_id =#{projectId} and del_flag = 0
@@ -202,7 +195,6 @@
 		unit AS unit,
 		item_name AS itemName,
 		project_id AS projectId,
-		parent_node AS parentNode,
 		create_date AS createDate
 		FROM sg_wbs_item
 		WHERE id=#{id}

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

@@ -102,8 +102,7 @@
 			del_flag,
 			project_name,
 			project_no,
-			number,
-			parent_node
+			number
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -114,8 +113,7 @@
 			#{delFlag},
 			#{projectName},
 			#{projectNo},
-			#{number},
-			#{parentNode}
+			#{number}
 		)
 	</insert>
 	

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

@@ -51,26 +51,28 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
 
     @Transactional(readOnly = false)
     public String save(MultipartFile file ,WbsItem wbsItem) throws IOException, InvalidFormatException {
+        //架空类型判断
         ImportExcel jk = new ImportExcel(file,1,new String[]{BashInfo.SHEET_GCHZ,BashInfo.SHEET_GCHZ1},false); //架空汇总
         if(ImportExcel.getSheet(jk) != null){
-            wbsItem.setType("1");
+            wbsItem.setType(BashInfo.PROJECT_JKXL);
             overheadLineService.saveJk(file,wbsItem);
-            //修改
-            return "1";
+            return BashInfo.PROJECT_JKXL;
         }
+        //电缆类型判断
         ImportExcel dljz = new ImportExcel(file, 1, BashInfo.SHEET_JZHZB,false);   //电缆线路建筑工程费用汇总表
         ImportExcel dlaz = new ImportExcel(file, 1, BashInfo.SHEET_HZHZB,false);   //电缆线路安装工程费用汇总表
         if(ImportExcel.getSheet(dlaz) != null || ImportExcel.getSheet(dljz) != null){
-            wbsItem.setType("2");
+            wbsItem.setType(BashInfo.PROJECT_DLXL);
             overheadLineService.saveDl(file,wbsItem);
-            return "2";
+            return BashInfo.PROJECT_DLXL;
         }
+        //变电站类型判断
         ImportExcel bdjz = new ImportExcel(file, 1, SubstationInfo.SHEET_JZHZB,false);   //变电站建筑工程费用汇总表
         ImportExcel bdaz = new ImportExcel(file, 1, SubstationInfo.SHEET_HZHZB,false);   //变电站安装工程费用汇总表
         if(ImportExcel.getSheet(bdjz) != null || ImportExcel.getSheet(bdaz) != null){
-            wbsItem.setType("3");
+            wbsItem.setType(BashInfo.PROJECT_BDZ);
             substationService.save(file,wbsItem);
-            return "3";
+            return BashInfo.PROJECT_BDZ;
         }
         return BashInfo.INVALIDFORMAT;
     }
@@ -87,6 +89,7 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
         return list;
     }
 
+    //分页查询
     public Page<WbsProject> findPage(Page<WbsProject> page, WbsProject wbsProject) {
         wbsProject.setPage(page);
         User user = UserUtils.getUser();

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

@@ -51,8 +51,7 @@ public class ProjectController extends BaseController {
     @RequestMapping(value = {"list", ""})
     public String list(WbsProject wbsProject, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<WbsProject> page = projectService.findPage(new Page<WbsProject>(request, response), wbsProject);
-//       List<WbsProject> list =  projectService.findList(wbsProject);
-       model.addAttribute("page",page);
+        model.addAttribute("page",page);
         return "modules/sg/project/management";
     }
 
@@ -124,31 +123,21 @@ public class ProjectController extends BaseController {
 //        String type = wbsItem.getType();   //项目类型
         String id = getId();
         wbsItem.setId(id);
-        try {
-//            保存数据到数据库
-//            if(type.equals("1")) {
-//                overheadLineService.saveJk(file,wbsItem);
-//            }
-//            if (type.equals("2")) {
-//                overheadLineService.saveDl(file,wbsItem);
-//            }
-//            if (type.equals("3")) {
-//                substationService.save(file,wbsItem);
-//            }
+//        try {
+           //判断结算数类型并保存数据到数据库
              String str = projectService.save(file,wbsItem);
              if(str.equals(BashInfo.INVALIDFORMAT)){
                  throw new RuntimeException(str);
              }
              addMessage(redirectAttributes, "导入成功");
              return "redirect:/a/jkxl/list?id="+id+"&type="+str;
-        } catch (RuntimeException e) {
-            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
-            return "redirect:/a/project/list";
-        }   catch (Exception e){
-            addMessage(redirectAttributes, "导入失败");
-            return "redirect:/a/project/list";
-        }
-//        return "redirect:/a/jkxl/list?id="+id;
+//        } catch (RuntimeException e) {
+//            addMessage(redirectAttributes, "导入失败,"+e.getMessage());
+//            return "redirect:/a/project/list";
+//        }   catch (Exception e){
+//            addMessage(redirectAttributes, "导入失败");
+//            return "redirect:/a/project/list";
+//        }
     }
 
     //导出
@@ -191,7 +180,7 @@ public class ProjectController extends BaseController {
 
 
 
-    //导出
+    //单个工程导出
     @RequestMapping("/exportone")
     public String exportone(HttpServletRequest request,Model model,HttpServletResponse response) throws IOException {
         String id = request.getParameter("id");
@@ -267,25 +256,16 @@ public class ProjectController extends BaseController {
                    if(jkxlDetailFee1.getWbsCode().equals(wbsCode)){
                        double jzFee = jkxlDetailFee1.getJzFee()!=null? jkxlDetailFee1.getJzFee():0.00;
                        double jzFee1 = jkxlDetailFee.getJzFee()!=null? jkxlDetailFee.getJzFee():0.00;
-//                       double sbgzFee = jkxlDetailFee1.getSbgzFee()!=null? jkxlDetailFee1.getSbgzFee():0.00;
-//                       double sbgzFee1 = jkxlDetailFee.getSbgzFee()!=null? jkxlDetailFee.getSbgzFee():0.00;
                        double azFee = jkxlDetailFee1.getAzFee()!=null? jkxlDetailFee1.getAzFee():0.00;
                        double azFee1 = jkxlDetailFee.getAzFee()!=null? jkxlDetailFee.getAzFee():0.00;
                        double qtFee = jkxlDetailFee1.getQtFee()!=null? jkxlDetailFee1.getQtFee():0.00;
                        double qtFee1 = jkxlDetailFee.getQtFee()!=null? jkxlDetailFee.getQtFee():0.00;
                        double totalFee = jkxlDetailFee1.getTotalFee()!=null? jkxlDetailFee1.getTotalFee():0.00;
                        double totalFee1 = jkxlDetailFee.getTotalFee()!=null? jkxlDetailFee.getTotalFee():0.00;
-//                       double jsFee = jkxlDetailFee1.getJsFee()!=null? jkxlDetailFee1.getJsFee():0.00;
-//                       double jsFee1 = jkxlDetailFee.getJsFee()!=null? jkxlDetailFee.getJsFee():0.00;
-//                       double cFee = jkxlDetailFee1.getcFee()!=null? jkxlDetailFee1.getcFee():0.00;
-//                       double cFee1 = jkxlDetailFee.getcFee()!=null? jkxlDetailFee.getcFee():0.00;
                        jkxlDetailFee1.setJzFee(jzFee+jzFee1);
-//                       jkxlDetailFee1.setSbgzFee(sbgzFee+sbgzFee1);
                        jkxlDetailFee1.setAzFee(azFee+azFee1);
                        jkxlDetailFee1.setQtFee(qtFee+qtFee1);
                        jkxlDetailFee1.setTotalFee(totalFee+totalFee1);
-//                       jkxlDetailFee1.setJsFee(jsFee+jsFee1);
-//                       jkxlDetailFee1.setcFee(cFee+cFee1);
                    }
                }
            }

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

@@ -50,8 +50,14 @@ public class ProjectTemController extends BaseController {
     }
 
 
-
-
+    /**
+     * 项目分页展示
+     * @param wbsProject
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"list", ""})
     public String list(WbsProject wbsProject, HttpServletRequest request, HttpServletResponse response, Model model) {
        List<WbsProject> list =  projectService.findList(wbsProject);
@@ -85,11 +91,6 @@ public class ProjectTemController extends BaseController {
                      wbsItem.setUnit(units[i]);
                     }
                 }
-//                if(null != itemNo && itemNo.length >0) {
-//                    if (StringUtils.isNotBlank(itemNo[i])) {
-//                        wbsItem.setItemNo(itemNo[i]);
-//                    }
-//                }
 //            保存数据到数据库
                 String id = getId();
                 wbsItem.setId(id);
@@ -121,21 +122,11 @@ public class ProjectTemController extends BaseController {
      */
     @RequestMapping("/importfile")
     public String importFile(MultipartFile file,WbsItem wbsItem, RedirectAttributes redirectAttributes, HttpServletRequest request, Model model) {
-//        String type = wbsItem.getType();   //项目类型
         String projectId = wbsItem.getProjectId();
         String id = getId();
         wbsItem.setId(id);
         try {
 //            保存数据到数据库
-//            if(type.equals("1")) {
-//                overheadLineService.saveJk(file, wbsItem);
-//            }
-//            if (type.equals("2")) {
-//                overheadLineService.saveDl(file, wbsItem);
-//            }
-//            if (type.equals("3")) {
-//                substationService.save(file, wbsItem);
-//            }
             String str = projectService.save(file,wbsItem);
             if(str.equals(BashInfo.INVALIDFORMAT)){
                 throw new RuntimeException(str);
@@ -149,8 +140,6 @@ public class ProjectTemController extends BaseController {
             addMessage(redirectAttributes, "导入失败");
             return "redirect:/a/project/tem/list?projectId="+projectId;
         }
-//        addMessage(redirectAttributes, "导入成功");
-//        return "redirect:/a/jkxl/list?id="+id+"&type="+type+"&projectId="+projectId;
     }
 
 
@@ -158,7 +147,7 @@ public class ProjectTemController extends BaseController {
 
 
     /**
-     * 返回
+     * 返回单个工程
      * @param request
      * @return
      */
@@ -168,11 +157,13 @@ public class ProjectTemController extends BaseController {
         return "redirect:/a/project/tem/list?projectId="+projectId;
     }
 
-//    @RequestMapping("/indexlist")
-//    public String indexList(){
-//        return "modules/sg/projecttem/addItem2Form";
-//    }
 
+    /**
+     * 获取工程数据
+     * @param wbsProject
+     * @param model
+     * @return
+     */
     @RequestMapping("/form")
     public String form(WbsProject wbsProject, Model model) {
         WbsProject wbsProject1 = projectService.get(wbsProject.getId());
@@ -204,6 +195,8 @@ public class ProjectTemController extends BaseController {
         }
         return newDate+result;
     }
+
+
     //校验项目名称是否存在
     @RequestMapping("/verfiy")
     @ResponseBody

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

@@ -8,7 +8,6 @@ import com.jeeplus.modules.sg.overheadline.entity.Settlement;
 import com.jeeplus.modules.sg.overheadline.entity.WbsProject;
 import com.jeeplus.modules.sg.overheadline.mapper.OverheadLineMapper;
 import com.jeeplus.modules.sg.overheadline.service.FeeAdjustService;
-import com.jeeplus.modules.sg.overheadline.service.RuleRatioService;
 import com.jeeplus.modules.sg.overheadline.service.SettlementService;
 import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import com.jeeplus.modules.sg.overheadline.util.SettementUtil;
@@ -33,45 +32,21 @@ public class SubstationService {
     @Autowired
     private FeeAdjustService feeAdjustService;
     @Autowired
-    private RuleRatioService ruleRatioService;
-    @Autowired
     private SettlementService settlementService;
     @Autowired
     private ItemService itemService;
 
 
 
-   public List<JkxlDetailFee> getList(String id,String type){
-       return overheadLineMapper.getList(id,type);
-   }
-
-
-   public JkxlDetailFee getDate(String id, String wbsCode){
-       return overheadLineMapper.getData(id,wbsCode);
-   }
-
-
    @Transactional(readOnly = false)
     public void save(MultipartFile file,WbsItem wbsItem) throws IOException, InvalidFormatException {
         String id = wbsItem.getId();
-        String type = wbsItem.getType();
         WbsItem wbsItem1 = itemService.get(id);
         if(wbsItem1 == null){
             wbsItem.setDelFlag("0");
             //保存项目
             itemService.save(wbsItem);
         }
-//        List<JkxlDetailFee> jkxlDetailFees = overheadLineMapper.findList(id,type);
-//        if(jkxlDetailFees != null && jkxlDetailFees.size()>0){
-//            overheadLineMapper.delete(id);
-//            feeAdjustService.delete(id);
-//            settlementService.delete(id);
-//        }
-        //获取调差系数
-//        double[] tcRate = new double[3];
-//        tcRate[0] = ruleRatioService.getValueByName(SubstationInfo.RATIO_RGTC).getValue()/100;
-
-
         //读取表格
         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);  // 措施项目清单计价表（一）
@@ -115,17 +90,13 @@ public class SubstationService {
        double btex = BashInfo.getBtex(total);
         //变电站 结算汇总
         List<Settlement> settlementsBdz =  SettementUtil.getComparison(total);
-//        double cbperson = ExcelUtil.getDouble(tbrsb,BashInfo.QT_HJ,0,6);//获取投标人设备表合计
-        double jzcs = BashInfo.getJzCs(csqd1);
-        double azcs = BashInfo.getAzCs(csqd1);
-//        double word1total =  ExcelUtil.getDouble(csqd1,BashInfo.QT_HJ,0,4);//获取措施费清单计价表一
+        double jzcs = BashInfo.getJzCs(csqd1); //建筑措施费
+        double azcs = BashInfo.getAzCs(csqd1);  //安装措施费
         double word1total =  jzcs+azcs;//获取措施费清单计价表一
-//        double word2total=ExcelUtil.getDouble(csqd2,SubstationInfo.CS_JZ,0,10);//获取措施费二表措施项目合计金额
         double otherBdzTotal =  ExcelUtil.getDouble(qt,BashInfo.QT_HJ,0,2);//获取其他项目费合计
        //规费
         double jzGf = BashInfo.getJzGf(gf);
         double azGf = BashInfo.getAzGf(gf);
-//        double feesBdzCount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
         double feesBdzCount =  jzGf+azGf;//获取规费合计
 
        //安装措施费
@@ -277,7 +248,6 @@ public class SubstationService {
                 double rateCs = zjgcAzFee/zjgcAzTotal;  //措施费分摊比例
                 double rateQt = zjgcAzFee/zjgcTotal;    //其他费用分摊比例
                 double rateRg = rgAzFee/rgAzTotal;  //人工费比例
-//                jkxlDetailFee.setRgCost(jkxlDetailFee.getOriginalRgCost()/(1+tcRate[0]));
 //                double measuresFee1 = (zjgcAzFee-originalFbrCost/(1+jxslAz)*jxslAz)*azcsRate[0]+(rgAzFee/(1+tcRate[0])*azcsRate[1]); //措施费一（2）
                 double measuresFee1 = (zjgcAzFee-originalFbrCost/(1+jxslAz)*jxslAz)*azcsRate[0]+azCsFee*rateRg; //措施费一（2）
                 double measuresFee2 = 0.00;   //措施费一（2）
@@ -354,7 +324,6 @@ public class SubstationService {
             double gftotal = jzTotal.get(0).getFees()+azTotal.get(0).getFees();
 
             for(JkxlDetailFee jkxlDetailFee1 : jzTotal){
-                double ftRate = jkxlDetailFee1.getZjgcFee()/zjgcTotal;
                 double csftRate = 0.00;
                 if(cstotal1 != 0.00) {
                     csftRate = jkxlDetailFee1.getMeasuresFee1() / cstotal1;
@@ -372,7 +341,6 @@ public class SubstationService {
                 jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee()+csft+gfft+texft);
             }
             for(JkxlDetailFee jkxlDetailFee1 : azTotal){
-                double ftRate = jkxlDetailFee1.getZjgcFee()/zjgcTotal;
                 double csftRate = 0.00;
                 if(cstotal1 != 0.00) {
                     csftRate = jkxlDetailFee1.getMeasuresFee1() / cstotal1;
@@ -517,14 +485,11 @@ public class SubstationService {
                 double zjgcJzFee = jkxlDetailFee.getZjgcFee();
                 double rateCs = zjgcJzFee/zjgcJzTotal;  //措施费分摊比例
                 double rateQt = zjgcJzFee/zjgcJzTotal;    //其他费用分摊比例
-//                jkxlDetailFee.setRgCost(jkxlDetailFee.getOriginalRgCost()/(1+tcRate[0]));
                 double measuresFee1 = (zjgcJzFee -(originalFbrCost/(1+jxslJz)*jxslJz))*jzcsRate; //措施费一（1）
                 double measuresFee2 = csJzFee*rateCs;   //措施费一（2）
                 double measuresFee3 = 0.00; //措施费二
                 double otherFee =qtFees[2]*rateQt; //其他费用
                 double fees = (zjgcJzFee-(originalFbrCost/(1+jxslJz)*jxslJz))*(jzgfRate[0]+jzgfRate[1]*0.2);  //规费
-//                double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee-originalFbrCost)*texRate; //税金
-//                double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-originalFbrCost; //合计
                 if(f){
                     tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计
@@ -588,7 +553,6 @@ public class SubstationService {
                 if(gftotal != 0.00) {
                     gfRate = jkxlDetailFee1.getFees() / gftotal;
                 }
-                double ftRate = jkxlDetailFee1.getZjgcFee()/zjgcJzTotal;
                 double csft = (jsCs-(cstotal1+cstotal2+cstotal3))*csftRate;
                 double gfft = (jsGf-gftotal)*gfRate;
                 double texft = (csft+gfft)*texRate;
@@ -665,8 +629,6 @@ public class SubstationService {
             //结算汇总取值结束
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,3);//安装直接工程费合计
             double rgAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,4);//安装人工费合计
-//            double csAzFee = SubstationInfo.getCsAzFee(csqd2);//安装措施分摊费
-//            double tbrAzFee = BashInfo.getFbrAzFee(tbrsb); //投标人安装费
             double[] aqwmAzFees = BashInfo.getAqwfAzFee(csqd1);  //安装安全文明施工费
             double fbrAzFee = ExcelUtil.getDouble(azqd,SubstationInfo.AZMX_BDZAZ,2,15);
             double jxslAz = 0.00;
@@ -716,7 +678,6 @@ public class SubstationService {
                 double rateCs = zjgcAzFee/zjgcAzTotal;  //措施费分摊比例
                 double rateQt = zjgcAzFee/zjgcAzTotal;    //其他费用分摊比例
                 double rateRg = rgAzFee/rgAzTotal;   //人工费比例
-//                jkxlDetailFee.setRgCost(jkxlDetailFee.getOriginalRgCost()/(1+tcRate[0]));
 //                double measuresFee1 = (zjgcAzFee-originalFbrCost/(1+jxslAz)*jxslAz)*azcsRate[0]+(rgAzFee/(1+tcRate[0])*azcsRate[1]); //措施费一（2）
                 double measuresFee1 = (zjgcAzFee-originalFbrCost/(1+jxslAz)*jxslAz)*azcsRate[0]+azCsFee*rateRg; //措施费一（1）
                 double measuresFee2 = 0.00;   //措施费一（2）
@@ -724,8 +685,6 @@ public class SubstationService {
                 double otherFee =qtFees[2]*rateQt; //其他费用
 //                double fees = rgAzFee/(1+tcRate[0])*azgfRate[0]+rgAzFee/(1+tcRate[0])*azgfRate[1]*1.6;  //规费
                 double fees = azGf*rateRg;  //规费
-//                double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee-originalFbrCost)*texRate; //税金
-//                double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-originalFbrCost; //合计
                 if(f){
                     tax = (originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee-originalFbrCost)*texRate; //税金
                     totalfee = originalTotalCost+measuresFee1+measuresFee2+measuresFee3+fees+otherFee+tax-originalFbrCost; //合计

src/main/resources/properties/jeeplus.properties

@@ -14,8 +14,8 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
 jdbc.password=root
 jdbc.testSql=SELECT 'x'

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -26,7 +26,7 @@ layui.config({
     {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
 
     {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码"},
-    {field:'fbfxysj', align:'center', title: '分部分项',colspan:'7'},
+    {field:'fbfxysj', align:'center', title: '分部分项',colspan:'6'},
     //{field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
     {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'7'},
 
@@ -35,7 +35,6 @@ layui.config({
     {field:'hjje', width:120,align:'center',title:'合计金额',totalRow: true},
     {field:'zjgcf', width:120,align:'center',title:'直接工程费',totalRow: true},
     {field:'rgf1', width:120,align:'center',title:'人工费',totalRow: true},
-    {field:'rgf2', width:120,align:'center',title:'人工费(调差后)',totalRow: true},
     {field:'cbrcg1', width:120,align:'center',title:'承包人采购',totalRow: true},
     {field:'fbrcg1', width:120,align:'center',title:'发包人采购',totalRow: true},
     {field:'jxf1', width:120,align:'center',title:'机械费',totalRow: true},
@@ -74,14 +73,8 @@ layui.config({
         "fbrcg1":doIt(${data.originalFbrCost}),
         "jxf1":doIt(${data.originalJxCost}),
 
-        "rgf2":doIt(${data.rgCost}),
-        "cbrcg2":doIt(${data.cbrCost}),
-        "fbrcg2":doIt(${data.fbrCost}),
-        "jxf2": doIt(${data.jxCost}),
+
         "rgf3": "<c:if test="${ empty data.rgFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.rgFtFee}">${data.rgFtFee}</c:if>",
-        "cbrcg3": "<c:if test="${ empty data.cbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.cbrFtFee}">${data.cbrFtFee}</c:if>",
-        "fbrcg3": "<c:if test="${ empty data.fbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.fbrFtFee}">${data.fbrFtFee}</c:if>",
-        "jxf3": "<c:if test="${ empty data.jxFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.jxFtFee}">${data.jxFtFee}</c:if>",
 
         "csf_1":doIt(${data.measuresFee1}),
         "csf_2":doIt(${data.measuresFee2}),
@@ -90,7 +83,6 @@ layui.config({
         "gf":doIt(${data.fees}),
         "sf":doIt(${data.tex}),
         "hj": doIt(${data.totalFee}),
-        "gxfy":doIt(${data.gxFee}),
         "pid":"${data.parentNode}"
     },
     </c:if>