1111

src/main/java/com/jeeplus/modules/sg/entity/JkxlData.java

@@ -28,6 +28,10 @@ public class JkxlData {
     private Double originalRate;
     private Double bzFee;
     private Double jkFee;
+    private Double rgFtFee;
+    private Double cbrFtFee;
+    private Double fbrFtFee;
+    private Double jxFtFee;
 
     private String wbsId;
     private String projectId;
@@ -157,6 +161,38 @@ public class JkxlData {
         this.zjgcFee = zjgcFee;
     }
 
+    public Double getRgFtFee() {
+        return rgFtFee;
+    }
+
+    public void setRgFtFee(Double rgFtFee) {
+        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;
     }

src/main/java/com/jeeplus/modules/sg/mapper/xml/JkxlMapper.xml

@@ -33,7 +33,11 @@
          b.total_fee as totalFee,
          b.original_rate as originalRate,
          b.bz_fee as bzFee,
-         b.jk_fee as jkFee
+         b.jk_fee as jkFee,
+         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_data a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
          and b.id = #{id}
 	</select>
@@ -77,7 +81,11 @@
 		 total_fee,
 		 bz_fee,
 		 jk_fee,
-		 zjgc_fee
+		 zjgc_fee,
+		 rg_fee_ft,
+		 cbr_fee_ft,
+		 fbr_fee_ft,
+		 jx_fee_ft
 		) values (
 		 #{id},
 		 #{wbsCode},
@@ -99,7 +107,11 @@
 		 #{totalFee},
 		 #{bzFee},
 		 #{jkFee},
-		 #{zjgcFee}
+		 #{zjgcFee},
+		 #{rgFtFee},
+		 #{cbrFtFee},
+		 #{fbrFtFee},
+		 #{jxFtFee}
 		)
 	</insert>
 

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -189,12 +189,12 @@ public class JkxlController extends BaseController {
       double fbrCost = originalFbrCost/(1+sl); //后发包人采购
       double originalJxrCost = importExcel.getDouble(row[i],17); //原机械费
       double jxCost = originalJxrCost/(1+rate[2]); //后机械费
-      double measuresFee1 = ((zjgcFees-fbrCost)/(1+sl)*sl)*csRate[0]; //措施费1
+      double measuresFee1 = (zjgcFees-fbrCost*sl)*csRate[0]; //措施费1
 //      double measuresFee1 = (rgCost+cbrCost+fbrCost+jxCost)*csRate[0]; //措施费1
       double measuresFee2 = rgCost*csRate[1];   //措施费2
       double fees = rgCost*gfRate[1]*1.12+rgCost*gfRate[0];  //规费
       double tax = (originalTotalCost+measuresFee1+measuresFee2+fees+otherFee)*0.09; //税金
-      double totalfee = rgCost+cbrCost+fbrCost+jxCost+measuresFee1+measuresFee2+fees+otherFee+tax-fbrCost; //合计
+      double totalfee = originalTotalCost+measuresFee1+measuresFee2+fees+otherFee+tax-fbrCost; //合计
       jkxlData.setOriginalTotalCost(originalTotalCost);
       jkxlData.setOriginalRate(orRate);
       jkxlData.setOriginalRgCost(originalRgCost);

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

@@ -210,7 +210,7 @@
                     "wbssbm": "${data.wbsCode}",
 
                     "hjje": "${data.originalTotalCost}",
-                    "zjgcf":"0",
+                    "zjgcf":"${data.zjgcFee}",
                     "rgf1": "${data.originalRgCost}",
                     "cbrcg1": "${data.originalCbrCost}",
                     "fbrcg1": "${data.originalFbrCost}",
@@ -221,10 +221,11 @@
                     "fbrcg2":"${data.fbrCost}",
                     "jxf2": "${data.jxCost}",
 
-                    "rgf3": "0",
-                    "cbrcg3": "0",
-                    "fbrcg3": "0",
-                    "jxf3": "0",
+                    <%--"rgf3": "${data.rgFtFee}",--%>
+                    "rgf3": "${data.rgFtFee}",
+                    "cbrcg3": "${data.cbrFtFee}",
+                    "fbrcg3": "${data.fbrFtFee}",
+                    "jxf3": "${data.jxFtFee}",
 
                     "csf_1": "${data.measuresFee1}",
                     "csf_2": "${data.measuresFee2}",